chrome/browser/chromeos/policy/device_status_collector_browsertest.cc - Issue 25112004: Move statistics_provider to chromeos/system

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 25112004: Move statistics_provider to chromeos/system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Similarity=33 Created 7 years, 2 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/preferences.cc » ('j') | chromeos/system/statistics_provider.cc » ('J')
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 73371e4371f867e027375faf96e567fb132c6cd0..1cc03a8366e5ccefeefa1102bc22a0ef12b76685 100644

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

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

@@ -17,13 +17,12 @@

#include "chrome/browser/chromeos/settings/cros_settings_provider.h"

#include "chrome/browser/chromeos/settings/device_settings_service.h"

#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

-#include "chrome/browser/chromeos/system/mock_statistics_provider.h"

-#include "chrome/browser/chromeos/system/statistics_provider.h"

#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"

#include "chrome/common/pref_names.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/shill_device_client.h"

#include "chromeos/network/network_handler.h"

+#include "chromeos/system/mock_statistics_provider.h"

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

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

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