chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc - Issue 541813002: Componentize chrome/common/content_settings files.

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/ui/content_settings/content_setting_bubble_model_unittest.cc

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

Patch Set: fix 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/fullscreen/fullscreen_controller.h » ('j') | components/components_tests.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

index dc9a7678cd904305f7e5075d61115f878a7d8b07..e610488b632aaf95488edb2abca821a42e7ed20f 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -13,10 +13,10 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/grit/generated_resources.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.h"

#include "components/infobars/core/infobar_delegate.h"

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

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