diff -r 000000000000 -r 6474c204b198 dom/camera/GonkCameraManager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/camera/GonkCameraManager.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2012-2014 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ICameraControl.h"
+
+#include <camera/Camera.h>
+
+#include "CameraCommon.h"
+#include "GonkCameraControl.h"
+
+using namespace mozilla;
+
+// From ICameraControl, gonk-specific management functions
+nsresult
+ICameraControl::GetNumberOfCameras(int32_t& aDeviceCount)
+{
+  aDeviceCount = android::Camera::getNumberOfCameras();
+  return NS_OK;
+}
+
+nsresult
+ICameraControl::GetCameraName(uint32_t aDeviceNum, nsCString& aDeviceName)
+{
+  int32_t count = android::Camera::getNumberOfCameras();
+  int32_t deviceNum = static_cast<int32_t>(aDeviceNum);
+
+  DOM_CAMERA_LOGI("GetCameraName : getNumberOfCameras() returned %d\n", count);
+  if (deviceNum < 0 || deviceNum > count) {
+    DOM_CAMERA_LOGE("GetCameraName : invalid device number (%u)\n", aDeviceNum);
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  android::CameraInfo info;
+  int rv = android::Camera::getCameraInfo(deviceNum, &info);
+  if (rv != 0) {
+    DOM_CAMERA_LOGE("GetCameraName : get_camera_info(%d) failed: %d\n", deviceNum, rv);
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  switch (info.facing) {
+    case CAMERA_FACING_BACK:
+      aDeviceName.Assign("back");
+      break;
+
+    case CAMERA_FACING_FRONT:
+      aDeviceName.Assign("front");
+      break;
+
+    default:
+      aDeviceName.Assign("extra-camera-");
+      aDeviceName.AppendInt(deviceNum);
+      break;
+  }
+  return NS_OK;
+}
+
+nsresult
+ICameraControl::GetListOfCameras(nsTArray<nsString>& aList)
+{
+  int32_t count = android::Camera::getNumberOfCameras();
+  DOM_CAMERA_LOGI("getListOfCameras : getNumberOfCameras() returned %d\n", count);
+  if (count <= 0) {
+    return NS_OK;
+  }
+
+  // Allocate 2 extra slots to reserve space for 'front' and 'back' cameras
+  // at the front of the array--we will collapse any empty slots below.
+  aList.SetLength(2);
+  uint32_t extraIdx = 2;
+  bool gotFront = false;
+  bool gotBack = false;
+  while (count--) {
+    nsCString cameraName;
+    nsresult result = GetCameraName(count, cameraName);
+    if (result != NS_OK) {
+      continue;
+    }
+
+    // The first camera we find named 'back' gets slot 0; and the first
+    // we find named 'front' gets slot 1.  All others appear after these.
+    if (cameraName.EqualsLiteral("back")) {
+      CopyUTF8toUTF16(cameraName, aList[0]);
+      gotBack = true;
+    } else if (cameraName.EqualsLiteral("front")) {
+      CopyUTF8toUTF16(cameraName, aList[1]);
+      gotFront = true;
+    } else {
+      CopyUTF8toUTF16(cameraName, *aList.InsertElementAt(extraIdx));
+      extraIdx++;
+    }
+  }
+
+  if (!gotFront) {
+    aList.RemoveElementAt(1);
+  }
+
+  if (!gotBack) {
+    aList.RemoveElementAt(0);
+  }
+
+  return NS_OK;
+}
+
+// implementation-specific camera factory
+already_AddRefed<ICameraControl>
+ICameraControl::Create(uint32_t aCameraId)
+{
+  nsRefPtr<nsGonkCameraControl> control = new nsGonkCameraControl(aCameraId);
+  return control.forget();
+}