Upstream some more content/ DEPS-related cleanup.

content/common/android/command_line.cc

 // 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/browser/android/command_line.h"
+#include "content/common/android/command_line.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::ConvertJavaStringToUTF8;
 
 namespace {
 
+void ConvertJavaArrayOfStringsToVectorOfStrings(JNIEnv* env,

[Yaron, 2012/06/15 17:40:35]

Consider moving this to base/android/jni_array.h
Also is this actually a dup of JavaByteArrayToByteVector and we're just using
jobectArray when it could be jbyteArray?

[no sievers, 2012/06/15 20:34:41]

Ah AppendJavaStringArrayToStringVector() you mean, good catch. I had to add an
ascii version though.

+                                                jobjectArray jstrings,
+                                                std::vector<std::string>* vec) {
+  vec->clear();
+  jsize length = env->GetArrayLength(jstrings);
+  for (jsize i = 0; i < length; ++i) {
+    jstring item = static_cast<jstring>(
+        env->GetObjectArrayElement(jstrings, i));
+    vec->push_back(base::android::ConvertJavaStringToUTF8(env, item));
+    env->DeleteLocalRef(item);
+  }
+}
+
 void AppendJavaStringArrayToCommandLine(JNIEnv* env,
                                         jobjectArray array,
                                         bool includes_program) {
   CommandLine::StringVector vec;
   if (array)
     ConvertJavaArrayOfStringsToVectorOfStrings(env, array, &vec);
   if (!includes_program)
     vec.insert(vec.begin(), "");
   CommandLine extra_command_line(vec);
   CommandLine::ForCurrentProcess()->AppendArguments(extra_command_line,
@@ skipping 42 matching lines @@
 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);
 }