[InfoBar] remove unnecesary checks from some delegates.

chrome/browser/infobars/insecure_content_infobar_delegate.cc

 // Copyright (c) 2011 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/infobars/insecure_content_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/render_messages.h"
@@ skipping 64 matching lines @@
 
 // OK button is labelled "don't load".  It triggers Accept(), but really
 // means stay secure, so do nothing but count the event and dismiss.
 bool InsecureContentInfoBarDelegate::Accept() {
   UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
       (type_ == DISPLAY) ? DISPLAY_USER_DID_NOT_LOAD : RUN_USER_DID_NOT_LOAD,
       NUM_EVENTS);
   return true;
 }
 
-
 // Cancel button is labelled "load anyways".  It triggers Cancel(), but really
 // means become insecure, so do the work of reloading the page.
 bool InsecureContentInfoBarDelegate::Cancel() {
   UMA_HISTOGRAM_ENUMERATION("InsecureContentInfoBarDelegateV2",
       (type_ == DISPLAY) ? DISPLAY_USER_OVERRIDE : RUN_USER_OVERRIDE,
       NUM_EVENTS);
 
-  if (web_contents()) {
-    int32 routing_id = web_contents()->GetRoutingID();
-    web_contents()->Send((type_ == DISPLAY) ?
-        static_cast<IPC::Message*>(
-            new ChromeViewMsg_SetAllowDisplayingInsecureContent(routing_id,
-                                                                true)) :
-        new ChromeViewMsg_SetAllowRunningInsecureContent(routing_id, true));
-  }
+  int32 routing_id = web_contents()->GetRoutingID();
+  web_contents()->Send(

[Peter Kasting, 2013/11/04 22:14:19]

Nit: The old wrapping (for this whole block) was correct, the new wrapping is
wrong.

[Miguel Garcia, 2013/11/05 14:17:56]

Done.

+      (type_ == DISPLAY)
+          ? static_cast<IPC::Message*>(
+                new ChromeViewMsg_SetAllowDisplayingInsecureContent(routing_id,
+                                                                    true))
+          : new ChromeViewMsg_SetAllowRunningInsecureContent(routing_id, true));
   return true;
 }
 
 string16 InsecureContentInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool InsecureContentInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   web_contents()->OpenURL(content::OpenURLParams(
       google_util::AppendGoogleLocaleParam(GURL("https://www.google.com/"
           "support/chrome/bin/answer.py?answer=1342714")),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }