Simplify and shrink the UMA reporting code for mixed content.

chrome/renderer/chrome_render_view_observer.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/renderer/chrome_render_view_observer.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 424 matching lines @@
 }
 
 bool ChromeRenderViewObserver::allowWriteToClipboard(WebFrame* frame,
                                                     bool default_value) {
   bool allowed = false;
   Send(new ChromeViewHostMsg_CanTriggerClipboardWrite(
       routing_id(), frame->document().url(), &allowed));
   return allowed;
 }
 
+static void SendInsecureContentSignal(int signal) {
+  UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent", signal,
+                            INSECURE_CONTENT_NUM_EVENTS);
+}
+
 bool ChromeRenderViewObserver::allowDisplayingInsecureContent(
     WebKit::WebFrame* frame,
     bool allowed_per_settings,
     const WebKit::WebSecurityOrigin& origin,
     const WebKit::WebURL& url) {
-  UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                            INSECURE_CONTENT_DISPLAY,
-                            INSECURE_CONTENT_NUM_EVENTS);
+  SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY);
+
   std::string host(origin.host().utf8());
   GURL frame_url(frame->document().url());
   if (isHostInDomain(host, kGoogleDotCom)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE);
     if (StartsWithASCII(frame_url.path(), kGoogleSupportPathPrefix, false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_SUPPORT,
-                                INSECURE_CONTENT_NUM_EVENTS);
+      SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_SUPPORT);
     } else if (StartsWithASCII(frame_url.path(),
                                kGoogleIntlPathPrefix,
                                false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_INTL,
-                                INSECURE_CONTENT_NUM_EVENTS);
+      SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_INTL);
     }
   }
+
   if (host == kWWWDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_WWW_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-    if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_READER,
-                                INSECURE_CONTENT_NUM_EVENTS);
-    }
-  } else if (host == kMailDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_MAIL_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kPlusDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_PLUS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kDocsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_DOCS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kSitesDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_SITES_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kPicasawebDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_PICASAWEB_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kCodeDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_CODE_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kGroupsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_GROUPS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kMapsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_MAPS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kWWWDotYoutubeDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HOST_YOUTUBE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  }
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_WWW_GOOGLE);
+    if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false))
+      SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_READER);
+  } else if (host == kMailDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_MAIL_GOOGLE);
+  else if (host == kPlusDotGoogleDotCom)

[jar (doing other things), 2011/10/27 23:41:31]

nit: start all these even lines with a close curly, and end them with an open
curly.  see note below.

+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_PLUS_GOOGLE);
+  else if (host == kDocsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_DOCS_GOOGLE);
+  else if (host == kSitesDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_SITES_GOOGLE);
+  else if (host == kPicasawebDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_PICASAWEB_GOOGLE);
+  else if (host == kCodeDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_CODE_GOOGLE);
+  else if (host == kGroupsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GROUPS_GOOGLE);
+  else if (host == kMapsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_MAPS_GOOGLE);
+  else if (host == kWWWDotYoutubeDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_YOUTUBE);
+
   GURL gurl(url);
-  if (EndsWith(gurl.path(), kDotHTML, false)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_DISPLAY_HTML,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  }
+  if (EndsWith(gurl.path(), kDotHTML, false))
+    SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HTML);
 
   if (allowed_per_settings || allow_displaying_insecure_content_)
     return true;
 
   Send(new ChromeViewHostMsg_DidBlockDisplayingInsecureContent(routing_id()));
   return false;
 }
 
 bool ChromeRenderViewObserver::allowRunningInsecureContent(
     WebKit::WebFrame* frame,
     bool allowed_per_settings,
     const WebKit::WebSecurityOrigin& origin,
     const WebKit::WebURL& url) {
   // Single value to control permissive mixed content behaviour.
   const bool enforce_insecure_content_on_all_domains = true;
 
-  UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                            INSECURE_CONTENT_RUN,
-                            INSECURE_CONTENT_NUM_EVENTS);
   std::string host(origin.host().utf8());
   GURL frame_url(frame->document().url());
   bool is_google = isHostInDomain(host, kGoogleDotCom);
   if (is_google) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE);
     if (StartsWithASCII(frame_url.path(), kGoogleSupportPathPrefix, false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_RUN_HOST_GOOGLE_SUPPORT,
-                                INSECURE_CONTENT_NUM_EVENTS);
+      SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_SUPPORT);
     } else if (StartsWithASCII(frame_url.path(),
                                kGoogleIntlPathPrefix,
                                false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_RUN_HOST_GOOGLE_INTL,
-                                INSECURE_CONTENT_NUM_EVENTS);
+      SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_INTL);
     }
   }
+
   if (host == kWWWDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_WWW_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-    if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false)) {
-      UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                                INSECURE_CONTENT_RUN_HOST_GOOGLE_READER,
-                                INSECURE_CONTENT_NUM_EVENTS);
-    }
-  } else if (host == kMailDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_MAIL_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kPlusDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_PLUS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kDocsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_DOCS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kSitesDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_SITES_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kPicasawebDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_PICASAWEB_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kCodeDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_CODE_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kGroupsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_GROUPS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kMapsDotGoogleDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_MAPS_GOOGLE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (host == kWWWDotYoutubeDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_YOUTUBE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (EndsWith(host, kDotGoogleUserContentDotCom, false)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_HOST_GOOGLEUSERCONTENT,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  }
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_WWW_GOOGLE);
+    if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false))
+      SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_READER);
+  } else if (host == kMailDotGoogleDotCom)

[jar (doing other things), 2011/10/27 23:41:31]

nit: Once you start using curlies, you need to use them throughout (i.e., when
used on an "if" clause, you must use it on the "else" clause.  In this case,
line 530 (and all even lines down to 548) should end with a open curly, and
should begin with a close curly.

+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_MAIL_GOOGLE);
+  else if (host == kPlusDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_PLUS_GOOGLE);
+  else if (host == kDocsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_DOCS_GOOGLE);
+  else if (host == kSitesDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_SITES_GOOGLE);
+  else if (host == kPicasawebDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_PICASAWEB_GOOGLE);
+  else if (host == kCodeDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_CODE_GOOGLE);
+  else if (host == kGroupsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GROUPS_GOOGLE);
+  else if (host == kMapsDotGoogleDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_MAPS_GOOGLE);
+  else if (host == kWWWDotYoutubeDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_YOUTUBE);
+  else if (EndsWith(host, kDotGoogleUserContentDotCom, false))
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLEUSERCONTENT);
+
   GURL gurl(url);
-  if (gurl.host() == kWWWDotYoutubeDotCom) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_TARGET_YOUTUBE,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  }
-  if (EndsWith(gurl.path(), kDotJS, false)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_JS,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (EndsWith(gurl.path(), kDotCSS, false)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_CSS,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  } else if (EndsWith(gurl.path(), kDotSWF, false)) {
-    UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
-                              INSECURE_CONTENT_RUN_SWF,
-                              INSECURE_CONTENT_NUM_EVENTS);
-  }
+  if (gurl.host() == kWWWDotYoutubeDotCom)
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_TARGET_YOUTUBE);
+
+  if (EndsWith(gurl.path(), kDotJS, false))
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_JS);
+  else if (EndsWith(gurl.path(), kDotCSS, false))
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_CSS);
+  else if (EndsWith(gurl.path(), kDotSWF, false))
+    SendInsecureContentSignal(INSECURE_CONTENT_RUN_SWF);
 
   if (allow_running_insecure_content_ || allowed_per_settings)
     return true;
 
   if (!(enforce_insecure_content_on_all_domains ||
         CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kNoRunningInsecureContent))) {
     bool mandatory_enforcement = (is_google ||
                                   isHostInDomain(host, kFacebookDotCom) ||
                                   isHostInDomain(host, kTwitterDotCom));
@@ skipping 445 matching lines @@
     // Decode the favicon using WebKit's image decoder.
     webkit_glue::ImageDecoder decoder(
         gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
     const unsigned char* src_data =
         reinterpret_cast<const unsigned char*>(&data[0]);
 
     return decoder.Decode(src_data, data.size());
   }
   return SkBitmap();
 }