Merge Content Settings IPCs back to chrome/common/render_messages.h

chrome/browser/renderer_host/chrome_render_message_filter.cc

 // 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.
 
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/render_messages.h"
-#include "components/content_settings/content/common/content_settings_messages.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/network_hints/common/network_hints_common.h"
 #include "components/network_hints/common/network_hints_messages.h"
 #include "components/rappor/rappor_service.h"
 #include "components/rappor/rappor_utils.h"
 #include "components/web_cache/browser/web_cache_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/service_worker_context.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/manifest_handlers/default_locale_handler.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 const uint32_t kFilteredMessageClasses[] = {
-    ChromeMsgStart, ContentSettingsMsgStart, NetworkHintsMsgStart,
+    ChromeMsgStart, NetworkHintsMsgStart,
 };
 
 void DidStartServiceWorkerForNavigationHint(bool success) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 }  // namespace
 
 ChromeRenderMessageFilter::ChromeRenderMessageFilter(
     int render_process_id,
@@ skipping 313 matching lines @@
   rappor::SampleString(g_browser_process->rappor_service(), metric,
                        rappor::ETLD_PLUS_ONE_RAPPOR_TYPE, sample);
 }
 
 void ChromeRenderMessageFilter::OnRecordRapporURL(const std::string& metric,
                                                   const GURL& sample) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                           metric, sample);
 }