Index: chrome/renderer/content_settings_observer_browsertest.cc |
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc |
index 8fbea14821c6af5931e407a3c5b58cd1813a998e..dcd7ed965961415e87b81aec82f32c3eaac29125 100644 |
--- a/chrome/renderer/content_settings_observer_browsertest.cc |
+++ b/chrome/renderer/content_settings_observer_browsertest.cc |
@@ -23,9 +23,6 @@ class MockContentSettingsObserver : public ContentSettingsObserver { |
virtual bool Send(IPC::Message* message); |
- MOCK_METHOD2(OnContentBlocked, |
- void(ContentSettingsType, const std::string&)); |
- |
MOCK_METHOD5(OnAllowDOMStorage, |
void(int, const GURL&, const GURL&, bool, IPC::Message*)); |
}; |
@@ -37,7 +34,6 @@ MockContentSettingsObserver::MockContentSettingsObserver( |
bool MockContentSettingsObserver::Send(IPC::Message* message) { |
IPC_BEGIN_MESSAGE_MAP(MockContentSettingsObserver, *message) |
- IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_AllowDOMStorage, |
OnAllowDOMStorage) |
IPC_MESSAGE_UNHANDLED(ADD_FAILURE()) |
@@ -49,27 +45,6 @@ bool MockContentSettingsObserver::Send(IPC::Message* message) { |
} // namespace |
-TEST_F(RenderViewTest, DidBlockContentType) { |
- MockContentSettingsObserver observer(view_); |
- EXPECT_CALL(observer, |
- OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
- observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); |
- |
- // Blocking the same content type a second time shouldn't send a notification. |
- observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); |
- ::testing::Mock::VerifyAndClearExpectations(&observer); |
- |
- // Blocking two different plugins should send two notifications. |
- std::string kFooPlugin = "foo"; |
- std::string kBarPlugin = "bar"; |
- EXPECT_CALL(observer, |
- OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS, kFooPlugin)); |
- EXPECT_CALL(observer, |
- OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS, kBarPlugin)); |
- observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, kFooPlugin); |
- observer.DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, kBarPlugin); |
-} |
- |
// Tests that multiple invokations of AllowDOMStorage result in a single IPC. |
TEST_F(RenderViewTest, AllowDOMStorage) { |
// Load some HTML, so we have a valid security origin. |