Remove the dependency on CameraHolder.

Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0

2 files changed, 5 insertions, 6 deletions

diff --git a/tests_camera/src/com/android/camera/activity/CameraActivityTest.java b/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
index eb027e9d3..ae07ffd91 100644
--- a/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
+++ b/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
@@ -16,11 +16,10 @@
 
 package com.android.camera.activity;
 
-import android.hardware.Camera.Parameters;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.camera.CameraActivity;
-import com.android.camera.CameraHolder;
+import com.android.camera.CameraTestDevice;
 import com.android.gallery3d.R;
 
 import static com.google.testing.littlemock.LittleMock.doReturn;
@@ -37,7 +36,7 @@ public class CameraActivityTest extends CameraTestCase <CameraActivity> {
 
     @LargeTest
     public void testTakePicture() throws Exception {
-        CameraHolder.injectMockCamera(mCameraInfo, mOneMockCamera);
+        CameraTestDevice.injectMockCamera(mCameraInfo, mOneMockCamera);
 
         getActivity();
         getInstrumentation().waitForIdleSync();
diff --git a/tests_camera/src/com/android/camera/activity/CameraTestCase.java b/tests_camera/src/com/android/camera/activity/CameraTestCase.java
index 339f005c2..38d03e137 100644
--- a/tests_camera/src/com/android/camera/activity/CameraTestCase.java
+++ b/tests_camera/src/com/android/camera/activity/CameraTestCase.java
@@ -29,7 +29,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.camera.CameraHolder;
+import com.android.camera.CameraTestDevice;
 import com.android.camera.app.CameraManager.CameraProxy;
 import com.android.camera.util.CameraUtil;
 import com.android.gallery3d.R;
@@ -169,11 +169,11 @@ public class CameraTestCase<T extends Activity> extends ActivityInstrumentationT
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        CameraHolder.injectMockCamera(null,  null);
+        CameraTestDevice.injectMockCamera(null, null);
     }
 
     protected void internalTestFailToConnect() throws Exception {
-        CameraHolder.injectMockCamera(mCameraInfo, null);
+        CameraTestDevice.injectMockCamera(mCameraInfo, null);
 
         getActivity();
         Instrumentation inst = getInstrumentation();