chrome/browser/geolocation/geolocation_browsertest.cc - Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common.

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/geolocation/geolocation_browsertest.cc

Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Keeping up to date with trunk. Created 9 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/extensions/extension_content_settings_store.h ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_browsertest.cc

diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc

index 4376a82d308405e702767aefa84057f7662cb838..d13da5a6d02cf57a378596c1cdbf811f37a06866 100644

--- a/chrome/browser/geolocation/geolocation_browsertest.cc

+++ b/chrome/browser/geolocation/geolocation_browsertest.cc

@@ -5,10 +5,9 @@

#include <string>

#include "base/compiler_specific.h"

-#include "base/stringprintf.h"

#include "base/string_number_conversions.h"

+#include "base/stringprintf.h"

#include "base/utf_string_conversions.h"

-#include "chrome/browser/content_settings/content_settings_pattern.h"

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

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

#include "chrome/browser/dom_operation_notification_details.h"

@@ -22,6 +21,7 @@

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/content_settings_pattern.h"

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

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

#include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h"