diff options
| author | avi <avi@chromium.org> | 2014-12-22 21:51:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-23 05:52:27 +0000 |
| commit | 6b10fd03dd0b8ddb91235c49d3f498fb2002c20d (patch) | |
| tree | d7aab532283c818d2103fc9b5ca8bcf29d50b2c8 /testing | |
| parent | b126eb8f934f25877b0e6d992902e88eac3fec7f (diff) | |
| download | chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.zip chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.gz chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers testing/, tools/, ui/, and win8/.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/819223002
Cr-Commit-Position: refs/heads/master@{#309538}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/native_test_launcher.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc index b7c9d28..26553c9 100644 --- a/testing/android/native_test_launcher.cc +++ b/testing/android/native_test_launcher.cc @@ -126,7 +126,7 @@ static void RunTests(JNIEnv* env, // Command line initialized basically, will be fully initialized later. static const char* const kInitialArgv[] = { "ChromeTestActivity" }; - CommandLine::Init(arraysize(kInitialArgv), kInitialArgv); + base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv); // Set the application context in base. base::android::ScopedJavaLocalRef<jobject> scoped_context( @@ -151,9 +151,10 @@ static void RunTests(JNIEnv* env, int argc = ArgsToArgv(args, &argv); // Fully initialize command line with arguments. - CommandLine::ForCurrentProcess()->AppendArguments( - CommandLine(argc, &argv[0]), false); - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + base::CommandLine::ForCurrentProcess()->AppendArguments( + base::CommandLine(argc, &argv[0]), false); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); base::FilePath files_dir( base::android::ConvertJavaStringToUTF8(env, jfiles_dir)); |