diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 14:21:32 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 14:21:32 +0000 |
| commit | 9ddbaa71ea3d63cf3502ffdc36c1cba3727e21ec (patch) | |
| tree | 6c549064e66dbfce9b24d877c6acf3e8fd8910ce | |
| parent | 4e7d605f45faa53de43c9f2ab32d1dc35a2a6f61 (diff) | |
| download | chromium_src-9ddbaa71ea3d63cf3502ffdc36c1cba3727e21ec.zip chromium_src-9ddbaa71ea3d63cf3502ffdc36c1cba3727e21ec.tar.gz chromium_src-9ddbaa71ea3d63cf3502ffdc36c1cba3727e21ec.tar.bz2 | |
Remove URL command line filtering from main startup path.
Update to fix startup performance regression for http://codereview.chromium.org/550008
BUG=9862
TEST=browser_tests --gtest_filter=BrowserInitTest.BlockBadURLs
Review URL: http://codereview.chromium.org/542076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36351 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_init.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index e495b71..e6739f9 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -634,8 +634,6 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine( Profile* profile) { std::vector<GURL> urls; std::vector<std::wstring> params = command_line_.GetLooseValues(); - ChildProcessSecurityPolicy *policy = - ChildProcessSecurityPolicy::GetInstance(); for (size_t i = 0; i < params.size(); ++i) { std::wstring& value = params[i]; @@ -661,6 +659,8 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine( URLFixerUpper::FixupRelativeFile(cur_dir_, value))); // Exclude dangerous schemes. if (url.is_valid()) { + ChildProcessSecurityPolicy *policy = + ChildProcessSecurityPolicy::GetInstance(); if (policy->IsWebSafeScheme(url.scheme()) || url.SchemeIs(chrome::kFileScheme) || !url.spec().compare(chrome::kAboutBlankURL)) { |