| Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java | 
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java | 
| index 67814188293e6dce33d0eaaf795d1e42e8ac2ffe..04d188e4116446e60966265b1f86e0dc4c7bc714 100644 | 
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java | 
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java | 
| @@ -13,10 +13,10 @@ import org.chromium.base.test.util.HostDrivenTest; | 
| import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; | 
| import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory; | 
| import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator; | 
| +import org.chromium.chrome.shell.ChromiumTestShellActivity; | 
| +import org.chromium.chrome.shell.ChromiumTestShellTestBase; | 
| +import org.chromium.chrome.shell.sync.SyncController; | 
| import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; | 
| -import org.chromium.chrome.testshell.ChromiumTestShellActivity; | 
| -import org.chromium.chrome.testshell.ChromiumTestShellTestBase; | 
| -import org.chromium.chrome.testshell.sync.SyncController; | 
| import org.chromium.content.browser.ContentView; | 
| import org.chromium.content.browser.ContentViewCore; | 
| import org.chromium.content.browser.test.util.Criteria; | 
|  |