Remove argument from BrowserStartupController.StartupCallback.onSuccess().

BrowserStartupController.StartupCallback.onSuccess() has 'alreadyStarted'
argument, which is not used anywhere.

Bug: 841403
Change-Id: I8faf23c3b1d61d217460c0e3943dadeb6111ee05
Reviewed-on: https://chromium-review.googlesource.com/1055796Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Dmitry Skiba <dskiba@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558819}

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

@@ -322,7 +322,7 @@ public class ChromeBrowserInitializer {
                         }
 
                         @Override
-                        public void onSuccess(boolean success) {
+                        public void onSuccess() {
                             tasks.start(false);
                         }
                     });

chrome/android/java/src/org/chromium/chrome/browser/ntp/ContentSuggestionsNotifier.java

@@ -503,7 +503,7 @@ public class ContentSuggestionsNotifier {
         if (!browserStartup.isStartupSuccessfullyCompleted()) {
             browserStartup.addStartupCompletedObserver(new StartupCallback() {
                 @Override
-                public void onSuccess(boolean alreadyStarted) {
+                public void onSuccess() {
                     flushCachedMetrics();
                 }
                 @Override

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchedPagesNotifier.java

@@ -176,7 +176,7 @@ public class PrefetchedPagesNotifier {
         if (!browserStartup.isStartupSuccessfullyCompleted()) {
             browserStartup.addStartupCompletedObserver(new StartupCallback() {
                 @Override
-                public void onSuccess(boolean alreadyStarted) {
+                public void onSuccess() {
                     r.run();
                 }
                 @Override

chrome/android/java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java

@@ -255,7 +255,7 @@ public class ChromeBrowserProvider extends ContentProvider {
                         .addStartupCompletedObserver(
                                 new BrowserStartupController.StartupCallback() {
                                     @Override
-                                    public void onSuccess(boolean alreadyStarted) {
+                                    public void onSuccess() {
                                         ensureNativeSideInitialized();
                                     }
 

chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java

@@ -63,18 +63,17 @@ public class GcmUma {
             @Override
             public void run() {
                 BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER)
-                        .addStartupCompletedObserver(
-                                new StartupCallback() {
-                                    @Override
-                                    public void onSuccess(boolean alreadyStarted) {
-                                        task.run();
-                                    }
+                        .addStartupCompletedObserver(new StartupCallback() {
+                            @Override
+                            public void onSuccess() {
+                                task.run();
+                            }
 
-                                    @Override
-                                    public void onFailure() {
-                                        // Startup failed.
-                                    }
-                                });
+                            @Override
+                            public void onFailure() {
+                                // Startup failed.
+                            }
+                        });
             }
         });
     }

content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

@@ -44,16 +44,12 @@ public class BrowserStartupController {
      * This provides the interface to the callbacks for successful or failed startup
      */
     public interface StartupCallback {
-        void onSuccess(boolean alreadyStarted);
+        void onSuccess();
         void onFailure();
     }
 
     private static final String TAG = "cr.BrowserStartup";
 
-    // Helper constants for {@link StartupCallback#onSuccess}.
-    private static final boolean ALREADY_STARTED = true;
-    private static final boolean NOT_ALREADY_STARTED = false;
-
     // Helper constants for {@link #executeEnqueuedCallbacks(int, boolean)}.
     @VisibleForTesting
     static final int STARTUP_SUCCESS = -1;
@@ -72,7 +68,7 @@ public class BrowserStartupController {
     @CalledByNative
     static void browserStartupComplete(int result) {
         if (sInstance != null) {
-            sInstance.executeEnqueuedCallbacks(result, NOT_ALREADY_STARTED);
+            sInstance.executeEnqueuedCallbacks(result);
         }
     }
 
@@ -113,7 +109,7 @@ public class BrowserStartupController {
             public void run() {
                 addStartupCompletedObserver(new StartupCallback() {
                     @Override
-                    public void onSuccess(boolean alreadyStarted) {
+                    public void onSuccess() {
                         assert mTracingController == null;
                         Context context = ContextUtils.getApplicationContext();
                         mTracingController = new TracingControllerAndroid(context);
@@ -191,7 +187,7 @@ public class BrowserStartupController {
                     if (mHasCalledContentStart) return;
                     if (contentStart() > 0) {
                         // Failed. The callbacks may not have run, so run them.
-                        enqueueCallbackExecution(STARTUP_FAILURE, NOT_ALREADY_STARTED);
+                        enqueueCallbackExecution(STARTUP_FAILURE);
                     }
                 }
             });
@@ -220,7 +216,7 @@ public class BrowserStartupController {
             if (!mHasCalledContentStart) {
                 if (contentStart() > 0) {
                     // Failed. The callbacks may not have run, so run them.
-                    enqueueCallbackExecution(STARTUP_FAILURE, NOT_ALREADY_STARTED);
+                    enqueueCallbackExecution(STARTUP_FAILURE);
                     startedSuccessfully = false;
                 }
             }
@@ -268,13 +264,13 @@ public class BrowserStartupController {
         }
     }
 
-    private void executeEnqueuedCallbacks(int startupResult, boolean alreadyStarted) {
+    private void executeEnqueuedCallbacks(int startupResult) {
         assert ThreadUtils.runningOnUiThread() : "Callback from browser startup from wrong thread.";
         mStartupDone = true;
         mStartupSuccess = (startupResult <= 0);
         for (StartupCallback asyncStartupCallback : mAsyncStartupCallbacks) {
             if (mStartupSuccess) {
-                asyncStartupCallback.onSuccess(alreadyStarted);
+                asyncStartupCallback.onSuccess();
             } else {
                 asyncStartupCallback.onFailure();
             }
@@ -285,11 +281,11 @@ public class BrowserStartupController {
 
     // Queue the callbacks to run. Since running the callbacks clears the list it is safe to call
     // this more than once.
-    private void enqueueCallbackExecution(final int startupFailure, final boolean alreadyStarted) {
+    private void enqueueCallbackExecution(final int startupFailure) {
         new Handler().post(new Runnable() {
             @Override
             public void run() {
-                executeEnqueuedCallbacks(startupFailure, alreadyStarted);
+                executeEnqueuedCallbacks(startupFailure);
             }
         });
     }
@@ -299,7 +295,7 @@ public class BrowserStartupController {
             @Override
             public void run() {
                 if (mStartupSuccess) {
-                    callback.onSuccess(ALREADY_STARTED);
+                    callback.onSuccess();
                 } else {
                     callback.onFailure();
                 }

content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java

@@ -77,13 +77,11 @@ public class BrowserStartupControllerTest {
         private boolean mWasSuccess;
         private boolean mWasFailure;
         private boolean mHasStartupResult;
-        private boolean mAlreadyStarted;
 
         @Override
-        public void onSuccess(boolean alreadyStarted) {
+        public void onSuccess() {
             assert !mHasStartupResult;
             mWasSuccess = true;
-            mAlreadyStarted = alreadyStarted;
             mHasStartupResult = true;
         }
 
@@ -131,9 +129,6 @@ public class BrowserStartupControllerTest {
 
         Assert.assertTrue("Callback should have been executed.", callback.mHasStartupResult);
         Assert.assertTrue("Callback should have been a success.", callback.mWasSuccess);
-        Assert.assertFalse(
-                "Callback should be told that the browser process was not already started.",
-                callback.mAlreadyStarted);
     }
 
     @Test
@@ -185,11 +180,6 @@ public class BrowserStartupControllerTest {
         Assert.assertTrue("Callback 2 should have been a success.", callback2.mWasSuccess);
         Assert.assertTrue("Callback 3 should have been executed.", callback3.mHasStartupResult);
         Assert.assertTrue("Callback 3 should have been a success.", callback3.mWasSuccess);
-        // Some startup tasks might have been enqueued after the browser process was started, but
-        // not the first one which kicked of the startup.
-        Assert.assertFalse(
-                "Callback 1 should be told that the browser process was not already started.",
-                callback1.mAlreadyStarted);
     }
 
     @Test
@@ -255,12 +245,8 @@ public class BrowserStartupControllerTest {
 
         Assert.assertTrue("Callback 3 should have been executed.", callback3.mHasStartupResult);
         Assert.assertTrue("Callback 3 should have been a success.", callback3.mWasSuccess);
-        Assert.assertTrue("Callback 3 should be told that the browser process was already started.",
-                callback3.mAlreadyStarted);
         Assert.assertTrue("Callback 4 should have been executed.", callback4.mHasStartupResult);
         Assert.assertTrue("Callback 4 should have been a success.", callback4.mWasSuccess);
-        Assert.assertTrue("Callback 4 should be told that the browser process was already started.",
-                callback4.mAlreadyStarted);
     }
 
     @Test
@@ -412,9 +398,6 @@ public class BrowserStartupControllerTest {
 
         Assert.assertTrue("Callback should have been executed.", callback.mHasStartupResult);
         Assert.assertTrue("Callback should have been a success.", callback.mWasSuccess);
-        Assert.assertFalse(
-                "Callback should be told that the browser process was not already started.",
-                callback.mAlreadyStarted);
     }
 
     @Test
@@ -459,8 +442,6 @@ public class BrowserStartupControllerTest {
 
         Assert.assertTrue("Callback should have been executed.", callback.mHasStartupResult);
         Assert.assertTrue("Callback should have been a success.", callback.mWasSuccess);
-        Assert.assertTrue("Callback should be told that the browser process was already started.",
-                callback.mAlreadyStarted);
     }
 
     @Test

content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java

@@ -106,10 +106,9 @@ public class ChromiumLinkerTestActivity extends Activity {
         try {
             BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER)
                     .startBrowserProcessesAsync(
-                            true,
-                            new BrowserStartupController.StartupCallback() {
+                            true, new BrowserStartupController.StartupCallback() {
                                 @Override
-                                public void onSuccess(boolean alreadyStarted) {
+                                public void onSuccess() {
                                     finishInitialization(savedInstanceState);
                                 }
 

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -95,10 +95,9 @@ public class ContentShellActivity extends Activity {
             try {
                 BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER)
                         .startBrowserProcessesAsync(
-                                true,
-                                new BrowserStartupController.StartupCallback() {
+                                true, new BrowserStartupController.StartupCallback() {
                                     @Override
-                                    public void onSuccess(boolean alreadyStarted) {
+                                    public void onSuccess() {
                                         finishInitialization(savedInstanceState);
                                     }