Enable content layer to initCommandLine on Android

chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
index 66ab8d2482fa69e0c6153f0f4730ee6eb813ac80..0d60c01990e021e62128e398cff98c93d515836e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
@@ -13,6 +13,7 @@
 
 import com.google.protos.ipc.invalidation.Types;
 
+import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.sync.notifier.SyncStatusHelper;
@@ -26,7 +27,6 @@
     private TestChromiumSyncAdapter mSyncAdapter;
 
     private static class TestChromiumSyncAdapter extends ChromiumSyncAdapter {
-        private boolean mCommandlineInitialized;
         private boolean mSyncRequested;
         private boolean mSyncRequestedForAllTypes;
         private int mObjectSource;
@@ -44,11 +44,6 @@ protected boolean useAsyncStartup() {
         }
 
         @Override
-        protected void initCommandLine() {
-            mCommandlineInitialized = true;
-        }
-
-        @Override
         public void requestSync(int objectSource, String objectId, long version, String payload) {
             mObjectSource = objectSource;
             mObjectId = objectId;
@@ -79,7 +74,7 @@ public void testRequestSyncNoInvalidationData() {
                 SyncStatusHelper.get(getActivity()).getContractAuthority(), null, syncResult);
         assertTrue(mSyncAdapter.mSyncRequestedForAllTypes);
         assertFalse(mSyncAdapter.mSyncRequested);
-        assertTrue(mSyncAdapter.mCommandlineInitialized);
+        assertTrue(CommandLine.isInitialized());
     }
 
     private void testRequestSyncSpecificDataType(boolean withObjectSource) {
@@ -103,7 +98,7 @@ private void testRequestSyncSpecificDataType(boolean withObjectSource) {
         assertEquals("objectid_value", mSyncAdapter.mObjectId);
         assertEquals(42, mSyncAdapter.mVersion);
         assertEquals("payload_value", mSyncAdapter.mPayload);
-        assertTrue(mSyncAdapter.mCommandlineInitialized);
+        assertTrue(CommandLine.isInitialized());
     }
 
     @MediumTest
@@ -127,6 +122,6 @@ public void testRequestSyncWhenChromeInBackground() throws InterruptedException
                 SyncStatusHelper.get(getActivity()).getContractAuthority(), null, syncResult);
         assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
         assertFalse(mSyncAdapter.mSyncRequested);
-        assertFalse(mSyncAdapter.mCommandlineInitialized);
+        assertTrue(CommandLine.isInitialized());
     }
 }