| Index: chrome/browser/content_settings/tab_specific_content_settings.cc
|
| diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| index 3c34704a656a981d6a9d4bb0a99dc8a3216f24a8..f0d44c6796460ad30af11194b359067b7ad2048c 100644
|
| --- a/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
|
| @@ -31,7 +30,6 @@
|
| #include "components/content_settings/core/browser/content_settings_details.h"
|
| #include "components/content_settings/core/browser/content_settings_utils.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| -#include "components/rappor/rappor_service.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_details.h"
|
| @@ -336,17 +334,9 @@ void TabSpecificContentSettings::OnContentBlockedWithDetail(
|
| if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
|
| content_settings::RecordMixedScriptAction(
|
| content_settings::MIXED_SCRIPT_ACTION_DISPLAYED_SHIELD);
|
| -
|
| - rappor::RapporService* rappor_service =
|
| - g_browser_process->rappor_service();
|
| - if (rappor_service) {
|
| - rappor_service->RecordSample(
|
| - "ContentSettings.MixedScript.DisplayedShield",
|
| - rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
|
| - net::registry_controlled_domains::GetDomainAndRegistry(
|
| - base::UTF16ToUTF8(details),
|
| - net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
|
| - }
|
| + content_settings::RecordMixedScriptActionWithRAPPOR(
|
| + content_settings::MIXED_SCRIPT_ACTION_DISPLAYED_SHIELD,
|
| + GURL(base::UTF16ToUTF8(details)));
|
| }
|
| }
|
| }
|
|
|