[Feedback] Move all tests to chrome/javatests

chrome/android/javatests/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
similarity index 96%
rename from chrome/android/javatests_shell/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
rename to chrome/android/javatests/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
index 9e3362be4da9eb179090872321339c666450c407..8ef3494eba9e913d40da6bbd788cab0aee7acc58 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java
@@ -11,10 +11,9 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.shell.ChromeShellActivity;
-import org.chromium.chrome.shell.ChromeShellTab;
-import org.chromium.chrome.shell.ChromeShellTestBase;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.UiUtils;
 
 import java.util.HashMap;
@@ -30,14 +29,18 @@ import javax.annotation.Nullable;
 /**
  * Test for {@link FeedbackCollector}.
  */
-public class FeedbackCollectorTest extends ChromeShellTestBase {
+public class FeedbackCollectorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final int CONNECTIVITY_TASK_TIMEOUT_MS = 10;
 
-    private ChromeShellActivity mActivity;
+    private ChromeActivity mActivity;
     private Profile mProfile;
     private TestFeedbackCollector mCollector;
     private TestConnectivityTask mTestConnectivityTask;
 
+    public FeedbackCollectorTest() {
+        super(ChromeActivity.class);
+    }
+
     /**
      * Class for facilitating testing of {@link FeedbackCollector}. All public methods are
      * automatically run on the UI thread, to simplify testing code.
@@ -185,17 +188,20 @@ public class FeedbackCollectorTest extends ChromeShellTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mActivity = launchChromeShellWithBlankPage();
-        assertTrue(waitForActiveShellToBeDoneLoading());
+        mActivity = getActivity();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                ChromeShellTab tab = mActivity.getActiveTab();
-                mProfile = tab.getProfile();
+                mProfile = Profile.getLastUsedProfile();
             }
         });
     }
 
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+
     @SmallTest
     @Feature({"Feedback"})
     public void testGatheringOfData() {