Upstream some more content/ DEPS-related cleanup.

content/common/android/command_line.cc

Index: content/common/android/command_line.cc
diff --git a/content/browser/android/command_line.cc b/content/common/android/command_line.cc
similarity index 91%
rename from content/browser/android/command_line.cc
rename to content/common/android/command_line.cc
index 1883b07f0f973f10595ed99b1485b9ee93550def..5b951741d3ec0c903777b5bc6089a22df123a907 100644
--- a/content/browser/android/command_line.cc
+++ b/content/common/android/command_line.cc
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/command_line.h"
+#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/command_line_jni.h"
-#include "content/browser/android/jni_helper.h"
 
+using base::android::AppendJavaStringArrayToStringVector;
 using base::android::ConvertJavaStringToUTF8;
 
 namespace {
@@ -17,9 +18,9 @@ namespace {
 void AppendJavaStringArrayToCommandLine(JNIEnv* env,
                                         jobjectArray array,
                                         bool includes_program) {
-  CommandLine::StringVector vec;
+  std::vector<std::string> vec;
   if (array)
-    ConvertJavaArrayOfStringsToVectorOfStrings(env, array, &vec);
+    AppendJavaStringArrayToStringVector(env, array, &vec);
   if (!includes_program)
     vec.insert(vec.begin(), "");
   CommandLine extra_command_line(vec);