diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 22:39:52 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 22:39:52 +0000 |
| commit | d0381510f773c5b4105f8f470a8847353f3bc682 (patch) | |
| tree | 9deaa04ecd8b919359a9eec97f7f3abe4d76e702 /chrome/browser/custom_handlers/protocol_handler_registry.cc | |
| parent | 668d965bc7684af43781743e13496521ca11d0b9 (diff) | |
| download | chromium_src-d0381510f773c5b4105f8f470a8847353f3bc682.zip chromium_src-d0381510f773c5b4105f8f470a8847353f3bc682.tar.gz chromium_src-d0381510f773c5b4105f8f470a8847353f3bc682.tar.bz2 | |
Convert the CustomHandler ui_test to a browser_test. There were two cases for the same thing, I just reduced it to one.
BUG=121574
Review URL: https://chromiumcodereview.appspot.com/9979018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_handlers/protocol_handler_registry.cc')
| -rw-r--r-- | chrome/browser/custom_handlers/protocol_handler_registry.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 500da2b..d81af98 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -188,9 +188,7 @@ bool ShouldRemoveHandlersNotInOS() { // difference (http://crbug.com/88255). return false; #else - const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); - return ShellIntegration::CanSetAsDefaultProtocolClient() && - !cmd_line.HasSwitch(switches::kDisableCustomProtocolOSCheck); + return ShellIntegration::CanSetAsDefaultProtocolClient(); #endif } |