Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java |
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java |
index fcf500f515e5fc3da2a0abda85d1ffe55cd13d13..1b1c64cb0910747b7891a4353a89a8c47cb5b920 100644 |
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java |
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java |
@@ -12,7 +12,7 @@ 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; |
@@ -80,7 +80,7 @@ public class SyncTest extends SyncTestBase { |
public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException { |
setupTestAccountAndSignInToSync(CLIENT_ID); |
- loadUrlWithSanitization("chrome://sync"); |
+ loadUrl("chrome://sync"); |
SyncTestUtil.AboutSyncInfoGetter aboutInfoGetter = |
new SyncTestUtil.AboutSyncInfoGetter(getActivity()); |
try { |
@@ -169,7 +169,7 @@ public class SyncTest extends SyncTestBase { |
SyncTestUtil.verifySyncIsActiveForAccount(mContext, account); |
} |
- private static ContentViewCore getContentViewCore(ChromeShellActivity activity) { |
- return activity.getActiveContentViewCore(); |
+ private static ContentViewCore getContentViewCore(ChromeActivity activity) { |
+ return activity.getActivityTab().getContentViewCore(); |
} |
} |