diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 04:57:29 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 04:57:29 +0000 |
| commit | c6e5ca6d02b9cd691b1d53e9dd7bdf95c6ba71b9 (patch) | |
| tree | 97161f4e25302180cbc3264e6fc907612ce95770 /content | |
| parent | 7ededb8449c89ff640a053f6dc03f9cb0f8e9559 (diff) | |
| download | chromium_src-c6e5ca6d02b9cd691b1d53e9dd7bdf95c6ba71b9.zip chromium_src-c6e5ca6d02b9cd691b1d53e9dd7bdf95c6ba71b9.tar.gz chromium_src-c6e5ca6d02b9cd691b1d53e9dd7bdf95c6ba71b9.tar.bz2 | |
Check in file from prevoius change that I missed
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/shell_browser_main_parts.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index 0447f23..a55b6ba 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -12,6 +12,7 @@ #include "base/threading/thread_restrictions.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" +#include "content/public/common/url_constants.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_devtools_delegate.h" @@ -27,8 +28,10 @@ namespace content { static GURL GetStartupURL() { - const CommandLine::StringVector& args = - CommandLine::ForCurrentProcess()->GetArgs(); + CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kContentBrowserTest)) + return GURL(chrome::kAboutBlankURL); + const CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) return GURL("http://www.google.com/"); |