Fix broken mixed script Rappor metric and add browser test

chrome/browser/content_settings/chrome_content_settings_utils.h

Index: chrome/browser/content_settings/chrome_content_settings_utils.h
diff --git a/chrome/browser/content_settings/chrome_content_settings_utils.h b/chrome/browser/content_settings/chrome_content_settings_utils.h
index c78e43b82abf4dadf9f12fa6c4e704ee9f215dc0..9dc121221f8726aa011a25f2cb076351c52577f8 100644
--- a/chrome/browser/content_settings/chrome_content_settings_utils.h
+++ b/chrome/browser/content_settings/chrome_content_settings_utils.h
@@ -7,6 +7,10 @@
 
 class GURL;
 
+namespace rappor {
+class RapporService;
+}  // namespace rappor
+
 // Put utility functions only used by //chrome code here. If a function declared
 // here would be meaningfully shared with other platforms, consider moving it to
 // components/content_settings/core/browser/content_settings_utils.h.
@@ -23,7 +27,8 @@ enum MixedScriptAction {
 };
 
 void RecordMixedScriptAction(MixedScriptAction action);
-void RecordMixedScriptActionWithRAPPOR(MixedScriptAction action,
+void RecordMixedScriptActionWithRAPPOR(rappor::RapporService* rappor_service,
+                                       MixedScriptAction action,
                                        const GURL& url);
 
 }  // namespace content_settings