| Index: content/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
|
| index b0d0e773616805cab05091687edb693155f6c4f5..fa710985dae88b7baa97eb2938fc59d0602b1599 100644
|
| --- a/content/shell/browser/shell_browser_main_parts.cc
|
| +++ b/content/shell/browser/shell_browser_main_parts.cc
|
| @@ -47,10 +47,10 @@ namespace content {
|
| namespace {
|
|
|
| GURL GetStartupURL() {
|
| - CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kContentBrowserTest))
|
| return GURL();
|
| - const CommandLine::StringVector& args = command_line->GetArgs();
|
| + const base::CommandLine::StringVector& args = command_line->GetArgs();
|
|
|
| #if defined(OS_ANDROID)
|
| // Delay renderer creation on Android until surface is ready.
|
| @@ -129,10 +129,10 @@ void ShellBrowserMainParts::InitializeMessageLoopContext() {
|
|
|
| void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
| #if defined(OS_ANDROID)
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableCrashReporter)) {
|
| base::FilePath crash_dumps_dir =
|
| - CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| + base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| switches::kCrashDumpsDir);
|
| crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dumps_dir));
|
| }
|
|
|