Move ChromeCommandLineInitUtil to base/

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

 // Copyright 2013 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;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
 
 import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
 import org.chromium.base.BuildInfo;
+import org.chromium.base.CommandLineInitUtil;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
@@ skipping 69 matching lines @@
 import org.chromium.ui.base.ResourceBundle;
 
 import java.lang.ref.WeakReference;
 import java.util.Locale;
 
 /**
  * Basic application functionality that should be shared among all browser applications that use
  * chrome layer.
  */
 public class ChromeApplication extends ContentApplication {
+    public static final String COMMAND_LINE_FILE = "chrome-command-line";
 
     private static final String TAG = "ChromiumApplication";
     private static final String PREF_BOOT_TIMESTAMP =
             "com.google.android.apps.chrome.ChromeMobileApplication.BOOT_TIMESTAMP";
     private static final long BOOT_TIMESTAMP_MARGIN_MS = 1000;
     private static final String PREF_LOCALE = "locale";
     private static final float FLOAT_EPSILON = 0.001f;
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chrome";
     private static final String DEV_TOOLS_SERVER_SOCKET_PREFIX = "chrome";
     private static final String SESSIONS_UUID_PREF_KEY = "chromium.sync.sessions.id";
@@ skipping 351 matching lines @@
         removeSessionCookies();
         ApplicationStatus.registerApplicationStateListener(createApplicationStateListener());
         AppBannerManager.setAppDetailsDelegate(createAppDetailsDelegate());
         mChromeLifetimeController = new ChromeLifetimeController(this);
 
         PrefServiceBridge.getInstance().migratePreferences(this);
     }
 
     @Override
     public void initCommandLine() {
-        ChromeCommandLineInitUtil.initChromeCommandLine(this);
+        CommandLineInitUtil.initCommandLine(this, COMMAND_LINE_FILE);
     }
 
     /**
      * Start the browser process asynchronously. This will set up a queue of UI
      * thread tasks to initialize the browser process.
      *
      * Note that this can only be called on the UI thread.
      *
      * @param callback the callback to be called when browser startup is complete.
      * @throws ProcessInitException
@@ skipping 393 matching lines @@
      */
     private void updatePasswordEchoState() {
         boolean systemEnabled = Settings.System.getInt(
                 getApplicationContext().getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) == 1;
         if (PrefServiceBridge.getInstance().getPasswordEchoEnabled() == systemEnabled) return;
 
         PrefServiceBridge.getInstance().setPasswordEchoEnabled(systemEnabled);
     }
 }