chrome/browser/content_settings/permission_queue_controller_unittest.cc - Issue 410993002: Componentize content_settings_types.h

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

Unified Diff: chrome/browser/content_settings/permission_queue_controller_unittest.cc

Issue 410993002: Componentize content_settings_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with trunk Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/permission_queue_controller.h ('k') | chrome/browser/content_settings/tab_specific_content_settings.h » ('j') | components/content_settings.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_queue_controller_unittest.cc

diff --git a/chrome/browser/content_settings/permission_queue_controller_unittest.cc b/chrome/browser/content_settings/permission_queue_controller_unittest.cc

index 7deac2c77f8c92b581e2c57ce7cfd6f685bfaa9d..d1ca0e70d8c17e192e125018353561933a49391e 100644

--- a/chrome/browser/content_settings/permission_queue_controller_unittest.cc

+++ b/chrome/browser/content_settings/permission_queue_controller_unittest.cc

@@ -8,9 +8,9 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/content_settings/permission_request_id.h"

#include "chrome/browser/infobars/infobar_service.h"

-#include "chrome/common/content_settings_types.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

+#include "components/content_settings/core/common/content_settings_types.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/mock_render_process_host.h"

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