chrome/renderer/content_settings_observer_browsertest.cc - Issue 541813002: Componentize chrome/common/content_settings files.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: OWNERS Created 6 years, 3 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

« chrome/DEPS ('K') | « chrome/renderer/content_settings_observer.h ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | components/content_settings/core/common/DEPS » ('J')

OLD	NEW
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 "chrome/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 "content/public/renderer/render_view.h"	9 #include "content/public/renderer/render_view.h"

10 #include "ipc/ipc_message_macros.h"	10 #include "ipc/ipc_message_macros.h"

11 #include "testing/gmock/include/gmock/gmock.h"	11 #include "testing/gmock/include/gmock/gmock.h"

12 #include "testing/gtest/include/gtest/gtest.h"	12 #include "testing/gtest/include/gtest/gtest.h"

13 #include "third_party/WebKit/public/web/WebView.h"	13 #include "third_party/WebKit/public/web/WebView.h"

14	14

15 using testing::_;	15 using testing::_;

(...skipping 353 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
369 }	369 }

370 EXPECT_FALSE(was_blocked);	370 EXPECT_FALSE(was_blocked);

371	371

372 // Verify that images are allowed.	372 // Verify that images are allowed.

373 EXPECT_CALL(	373 EXPECT_CALL(

374 mock_observer,	374 mock_observer,

375 OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)).Times(0);	375 OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)).Times(0);

376 EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));	376 EXPECT_TRUE(observer->allowImage(true, mock_observer.image_url_));

377 ::testing::Mock::VerifyAndClearExpectations(&observer);	377 ::testing::Mock::VerifyAndClearExpectations(&observer);

378 }	378 }

OLD	NEW