Fix up code to check whether we can silently handle RPH calls before gesture check.

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 849 matching lines @@
     return;
 
   ProtocolHandler handler =
       ProtocolHandler::CreateProtocolHandler(protocol, url, title);
 
   ProtocolHandlerRegistry* registry =
       tab_contents->profile()->GetProtocolHandlerRegistry();
   TabSpecificContentSettings* content_settings =
       tab_contents->content_settings();
 
+  if (registry->SilentlyHandleRegisterHandlerRequest(handler))
+    return;
+
   if (!user_gesture && window) {
     content_settings->set_pending_protocol_handler(handler);
     content_settings->set_previous_protocol_handler(
         registry->GetHandlerFor(handler.protocol()));
     window->GetLocationBar()->UpdateContentSettingsIcons();
     return;
   }
 
   // Make sure content-setting icon is turned off in case the page does
   // ungestured and gestured RPH calls.
   if (window) {
     content_settings->ClearPendingProtocolHandler();
     window->GetLocationBar()->UpdateContentSettingsIcons();
   }
 
-  if (!registry->SilentlyHandleRegisterHandlerRequest(handler)) {
-    content::RecordAction(
-        UserMetricsAction("RegisterProtocolHandler.InfoBar_Shown"));
-    InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
+  content::RecordAction(
+      UserMetricsAction("RegisterProtocolHandler.InfoBar_Shown"));
+  InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
 
-    RegisterProtocolHandlerInfoBarDelegate* rph_delegate =
-        new RegisterProtocolHandlerInfoBarDelegate(infobar_helper,
-                                                   registry,
-                                                   handler);
+  RegisterProtocolHandlerInfoBarDelegate* rph_delegate =
+      new RegisterProtocolHandlerInfoBarDelegate(infobar_helper,
+                                                 registry,
+                                                 handler);
 
-    for (size_t i = 0; i < infobar_helper->infobar_count(); i++) {
-      InfoBarDelegate* delegate = infobar_helper->GetInfoBarDelegateAt(i);
-      RegisterProtocolHandlerInfoBarDelegate* cast_delegate =
-          delegate->AsRegisterProtocolHandlerInfoBarDelegate();
-      if (cast_delegate != NULL && cast_delegate->IsReplacedBy(rph_delegate)) {
-        infobar_helper->ReplaceInfoBar(cast_delegate, rph_delegate);
-        rph_delegate = NULL;
-        break;
-      }
+  for (size_t i = 0; i < infobar_helper->infobar_count(); i++) {
+    InfoBarDelegate* delegate = infobar_helper->GetInfoBarDelegateAt(i);
+    RegisterProtocolHandlerInfoBarDelegate* cast_delegate =
+        delegate->AsRegisterProtocolHandlerInfoBarDelegate();
+    if (cast_delegate != NULL && cast_delegate->IsReplacedBy(rph_delegate)) {
+      infobar_helper->ReplaceInfoBar(cast_delegate, rph_delegate);
+      rph_delegate = NULL;
+      break;
     }
+  }
 
-    if (rph_delegate != NULL)
-      infobar_helper->AddInfoBar(rph_delegate);
-  }
+  if (rph_delegate != NULL)
+    infobar_helper->AddInfoBar(rph_delegate);
 }
 
 // static
 void Browser::FindReplyHelper(WebContents* web_contents,
                               int request_id,
                               int number_of_matches,
                               const gfx::Rect& selection_rect,
                               int active_match_ordinal,
                               bool final_update) {
   TabContents* tab_contents = TabContents::FromWebContents(web_contents);
@@ skipping 1356 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }