chrome/browser/chromeos/policy/device_status_collector_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

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/chromeos/policy/device_status_collector_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/chromeos/policy/device_status_collector.cc ('k') | chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

index 656cddfe685edfd445d7c4486c947e1147974fb0..700791d8e454dc110519cc9a8d6e4975918bd63f 100644

--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

@@ -16,8 +16,6 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

-#include "base/prefs/pref_service.h"

-#include "base/prefs/testing_pref_service.h"

#include "base/run_loop.h"

#include "base/strings/stringprintf.h"

#include "base/threading/sequenced_worker_pool.h"

@@ -42,6 +40,8 @@

#include "chromeos/network/network_state_handler.h"

#include "chromeos/settings/cros_settings_names.h"

#include "chromeos/system/fake_statistics_provider.h"

+#include "components/prefs/pref_service.h"

+#include "components/prefs/testing_pref_service.h"

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

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

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