[Android] Simplify logic for grabbing initial country-code.

testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java

 // Copyright 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.
 
 package org.chromium.native_test;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 
+import org.chromium.base.CommandLine;
 import org.chromium.base.PathUtils;
 import org.chromium.base.PowerMonitor;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.library_loader.NativeLibraries;
 
 /**
  *  Android's NativeActivity is mostly useful for pure-native code.
  *  Our tests need to go up to our own java classes, which is not possible using
  *  the native activity class loader.
  */
 public class ChromeNativeTestActivity extends Activity {
     private static final String TAG = "ChromeNativeTestActivity";
     private static final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread";
     // We post a delayed task to run tests so that we do not block onCreate().
     private static final long RUN_TESTS_DELAY_IN_MS = 300;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        CommandLine.init(new String[]{});
+
         // Needed by path_utils_unittest.cc
         PathUtils.setPrivateDataDirectorySuffix("chrome");
 
         ResourceExtractor resourceExtractor = ResourceExtractor.get(getApplicationContext());
         resourceExtractor.setExtractAllPaksForTesting();
         resourceExtractor.startExtractingResources();
         resourceExtractor.waitForCompletion();
 
         // Needed by system_monitor_unittest.cc
         PowerMonitor.createForTests(this);
@@ skipping 35 matching lines @@
     private void loadLibraries() {
         for (String library : NativeLibraries.LIBRARIES) {
             Log.i(TAG, "loading: " + library);
             System.loadLibrary(library);
             Log.i(TAG, "loaded: " + library);
         }
     }
 
     private native void nativeRunTests(String filesDir, Context appContext);
 }