[Android] Move CommandLine.java to base

The native CommandLine lives in base, and so too should the Java wrapper. Move
CommandLine.java to base, updating all references and factoring out previously
contained switches to BaseSwitches and ContentSwitches.

BUG=320747
TBR=ajwong@chromium.org

Review URL: https://codereview.chromium.org/62333025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236113 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 98 deletions

diff --git a/content/common/android/command_line.cc b/content/common/android/command_line.cc
deleted file mode 100644
index 8ac58c2..0000000
--- a/content/common/android/command_line.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "content/common/android/command_line.h"
-
-#include "base/android/jni_array.h"
-#include "base/android/jni_string.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "jni/CommandLine_jni.h"
-
-using base::android::AppendJavaStringArrayToStringVector;
-using base::android::ConvertJavaStringToUTF8;
-
-namespace {
-
-void AppendJavaStringArrayToCommandLine(JNIEnv* env,
-                                        jobjectArray array,
-                                        bool includes_program) {
-  std::vector<std::string> vec;
-  if (array)
-    AppendJavaStringArrayToStringVector(env, array, &vec);
-  if (!includes_program)
-    vec.insert(vec.begin(), "");
-  CommandLine extra_command_line(vec);
-  CommandLine::ForCurrentProcess()->AppendArguments(extra_command_line,
-                                                    includes_program);
-}
-
-}  // namespace
-
-static void Reset(JNIEnv* env, jclass clazz) {
-  CommandLine::Reset();
-}
-
-static jboolean HasSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
-  std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
-  return CommandLine::ForCurrentProcess()->HasSwitch(switch_string);
-}
-
-static jstring GetSwitchValue(JNIEnv* env, jclass clazz, jstring jswitch) {
-  std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
-  std::string value(CommandLine::ForCurrentProcess()->GetSwitchValueNative(
-      switch_string));
-  if (value.empty())
-    return 0;
-  // OK to release, JNI binding.
-  return base::android::ConvertUTF8ToJavaString(env, value).Release();
-}
-
-static void AppendSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
-  std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
-  CommandLine::ForCurrentProcess()->AppendSwitch(switch_string);
-}
-
-static void AppendSwitchWithValue(JNIEnv* env, jclass clazz,
-                                  jstring jswitch, jstring jvalue) {
-  std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
-  std::string value_string (ConvertJavaStringToUTF8(env, jvalue));
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(switch_string,
-                                                      value_string);
-}
-
-static void AppendSwitchesAndArguments(JNIEnv* env, jclass clazz,
-                                       jobjectArray array) {
-  AppendJavaStringArrayToCommandLine(env, array, false);
-}
-
-void InitNativeCommandLineFromJavaArray(JNIEnv* env, jobjectArray array) {
-  // TODO(port): Make an overload of Init() that takes StringVector rather than
-  // have to round-trip via AppendArguments.
-  CommandLine::Init(0, NULL);
-  AppendJavaStringArrayToCommandLine(env, array, true);
-}
-
-bool RegisterCommandLine(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
diff --git a/content/common/android/command_line.h b/content/common/android/command_line.h
deleted file mode 100644
index 3fe5efb..0000000
--- a/content/common/android/command_line.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
-#define CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
-
-#include <jni.h>
-
-// Appends all strings in the given array as flags to the Chrome command line.
-void InitNativeCommandLineFromJavaArray(JNIEnv* env,
-                                        jobjectArray init_command_line);
-
-// JNI registration boilerplate.
-bool RegisterCommandLine(JNIEnv* env);
-
-#endif  // CONTENT_COMMON_ANDROID_COMMAND_LINE_H_
diff --git a/content/common/android/common_jni_registrar.cc b/content/common/android/common_jni_registrar.cc
index c9d51e9..667224d 100644
--- a/content/common/android/common_jni_registrar.cc
+++ b/content/common/android/common_jni_registrar.cc
@@ -6,7 +6,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "content/common/android/command_line.h"
 #include "content/common/android/device_telephony_info.h"
 #include "content/common/android/hash_set.h"
 #include "content/common/android/trace_event_binding.h"
@@ -14,7 +13,6 @@
 
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
-  { "CommandLine", RegisterCommandLine },
   { "DeviceTelephonyInfo",
         content::DeviceTelephonyInfo::RegisterDeviceTelephonyInfo },
   { "HashSet", content::RegisterHashSet },