Fix broken mixed script Rappor metric and add browser test

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 19 matching lines @@
 class HostContentSettingsMap;
 
 namespace content {
 class RenderViewHost;
 }
 
 namespace net {
 class CookieOptions;
 }
 
+namespace rappor {
+class RapporService;
+}
+
 // This class manages state about permissions, content settings, cookies and
 // site data for a specific WebContents. It tracks which content was accessed
 // and which content was blocked. Based on this it provides information about
 // which types of content were accessed and blocked.
 class TabSpecificContentSettings
     : public content::WebContentsObserver,
       public content_settings::Observer,
       public content::WebContentsUserData<TabSpecificContentSettings> {
  public:
   // Fields describing the current mic/camera state. If a page has attempted to
@@ skipping 309 matching lines @@
   // Adds the given |SiteDataObserver|. The |observer| is notified when a
   // locale shared object, like for example a cookie, is accessed.
   void AddSiteDataObserver(SiteDataObserver* observer);
 
   // Removes the given |SiteDataObserver|.
   void RemoveSiteDataObserver(SiteDataObserver* observer);
 
   // Block all content. Used for testing content setting bubbles.
   void BlockAllContentForTesting();
 
+  // Set the Rappor service used for testing.
+  void SetRapporServiceForTesting(rappor::RapporService* rappor_service);
+
  private:
   friend class content::WebContentsUserData<TabSpecificContentSettings>;
 
   explicit TabSpecificContentSettings(content::WebContents* tab);
 
   // content::WebContentsObserver overrides.
   void RenderFrameForInterstitialPageCreated(
       content::RenderFrameHost* render_frame_host) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
@@ skipping 84 matching lines @@
   std::string media_stream_selected_video_device_;
 
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
+  // The service used to record Rappor metrics. Can be set for testing.
+  rappor::RapporService* rappor_service_;
+
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_