Convert ChromeSyncShell to use ChromePublic infrastructure (try #2)

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.shell.ChromeShellActivity;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 
 import java.util.concurrent.TimeoutException;
@@ skipping 47 matching lines @@
         });
 
         // TODO(pvalenzuela): When available, check that sync is still functional.
     }
 
     @LargeTest
     @Feature({"Sync"})
     public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException {
         setupTestAccountAndSignInToSync(CLIENT_ID);
 
-        loadUrlWithSanitization("chrome://sync");
+        loadUrl("chrome://sync");
         SyncTestUtil.AboutSyncInfoGetter aboutInfoGetter =
                 new SyncTestUtil.AboutSyncInfoGetter(getActivity());
         try {
             runTestOnUiThread(aboutInfoGetter);
         } catch (Throwable t) {
             Log.w(TAG,
                     "Exception while trying to fetch about sync info from ProfileSyncService.", t);
             fail("Unable to fetch sync info from ProfileSyncService.");
         }
         assertFalse("About sync info should not be empty.",
@@ skipping 68 matching lines @@
 
         // Disabling Android sync should turn Chrome sync engine off.
         mSyncContentResolver.setSyncAutomatically(account, authority, false);
         SyncTestUtil.verifySyncIsDisabled(mContext, account);
 
         // Enabling Android sync should turn Chrome sync engine on.
         mSyncContentResolver.setSyncAutomatically(account, authority, true);
         SyncTestUtil.verifySyncIsActiveForAccount(mContext, account);
     }
 
-    private static ContentViewCore getContentViewCore(ChromeShellActivity activity) {
-        return activity.getActiveContentViewCore();
+    private static ContentViewCore getContentViewCore(ChromeActivity activity) {
+        return activity.getActivityTab().getContentViewCore();
     }
 }