Revert of Convert ChromeSyncShell to use ChromePublic infrastructure

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
index e164db30f9ecf007b079843765295e9f4131946a..9951b85f7c4adc9a89e0c2630bceffadc2c81f3d 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java
@@ -9,7 +9,6 @@
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -90,8 +89,8 @@
     @Feature({"Sync"})
     public void testUploadMultipleOpenTabs() throws Exception {
         loadUrl(URL);
-        loadUrlInNewTab(URL2);
-        loadUrlInNewTab(URL3);
+        openNewTab(URL2);
+        openNewTab(URL3);
         waitForLocalTabsForClient(mClientName, URL, URL2, URL3);
         waitForServerTabs(URL, URL2, URL3);
     }
@@ -102,17 +101,10 @@
     public void testUploadAndCloseOpenTab() throws Exception {
         loadUrl(URL);
         // Can't have zero tabs, so we have to open two to test closing one.
-        loadUrlInNewTab(URL2);
+        openNewTab(URL2);
         waitForLocalTabsForClient(mClientName, URL, URL2);
         waitForServerTabs(URL, URL2);
-
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                assertTrue(TabModelUtils.closeCurrentTab(getActivity().getCurrentTabModel()));
-            }
-        });
-
+        closeActiveTab();
         waitForLocalTabsForClient(mClientName, URL);
         waitForServerTabs(URL);
     }
@@ -175,6 +167,24 @@
         deleteServerTabsForClient(FAKE_CLIENT);
         SyncTestUtil.triggerSyncAndWaitForCompletion(mContext);
         waitForLocalTabsForClient(FAKE_CLIENT);
+    }
+
+    private void openNewTab(final String url) {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                getActivity().createTab(url);
+            }
+        });
+    }
+
+    private void closeActiveTab() {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                getActivity().closeTab();
+            }
+        });
     }
 
     private String makeSessionTag() {