Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/renderer/content_settings_observer_browsertest.cc

Issue 798923003: Make chrome/renderer/content_settings_observer.cc depend on //components/contents_settings for IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix fuzzer compilation Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/content_settings/core/common/content_settings.h" 5 #include "components/content_settings/core/common/content_settings.h"
6 #include "chrome/common/render_messages.h" 6 #include "chrome/common/render_messages.h"
7 #include "chrome/renderer/content_settings_observer.h" 7 #include "chrome/renderer/content_settings_observer.h"
8 #include "chrome/test/base/chrome_render_view_test.h" 8 #include "chrome/test/base/chrome_render_view_test.h"
9 #include "components/content_settings/content/common/content_settings_messages.h "
9 #include "content/public/renderer/render_view.h" 10 #include "content/public/renderer/render_view.h"
10 #include "ipc/ipc_message_macros.h" 11 #include "ipc/ipc_message_macros.h"
11 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/WebKit/public/web/WebView.h" 14 #include "third_party/WebKit/public/web/WebView.h"
14 15
15 using testing::_; 16 using testing::_;
16 using testing::DeleteArg; 17 using testing::DeleteArg;
17 18
18 namespace { 19 namespace {
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 was_blocked = true; 367 was_blocked = true;
367 } 368 }
368 EXPECT_FALSE(was_blocked); 369 EXPECT_FALSE(was_blocked);
369 370
370 // Verify that images are allowed. 371 // Verify that images are allowed.
371 EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES, 372 EXPECT_CALL(mock_observer, OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
372 base::string16())).Times(0); 373 base::string16())).Times(0);
373 EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_)); 374 EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));
374 ::testing::Mock::VerifyAndClearExpectations(&observer); 375 ::testing::Mock::VerifyAndClearExpectations(&observer);
375 } 376 }
OLDNEW
« no previous file with comments | « chrome/renderer/content_settings_observer.cc ('k') | chrome/renderer/plugins/chrome_plugin_placeholder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698