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

chrome/renderer/content_settings_observer_browsertest.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 <stddef.h>
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/test/base/chrome_render_view_test.h"
-#include "components/content_settings/content/common/content_settings_messages.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using testing::_;
 using testing::DeleteArg;
@@ skipping 495 matching lines @@
       ContentSettingPatternSource(
           ContentSettingsPattern::Wildcard(),
           ContentSettingsPattern::Wildcard(),
           CONTENT_SETTING_BLOCK,
           std::string(),
           false));
 
   EXPECT_FALSE(observer->allowAutoplay(true));
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 }