chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc - Issue 644413003: Replace MockStatisticsProvider with FakeStatisticsProvider.

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_cloud_policy_manager_chromeos_unittest.cc

Issue 644413003: Replace MockStatisticsProvider with FakeStatisticsProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« chrome/browser/chromeos/customization_document_unittest.cc ('K') | « chrome/browser/chromeos/login/oobe_localization_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | chrome/browser/extensions/external_provider_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 121b7bc0f7e6022179a1c6d649f773bfd5212bfa..d19d26eac711f69482206398142288c95d468b63 100644

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

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

@@ -31,7 +31,7 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/fake_cryptohome_client.h"

#include "chromeos/dbus/fake_session_manager_client.h"

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

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

#include "chromeos/system/statistics_provider.h"

#include "components/policy/core/common/cloud/cloud_policy_client.h"

#include "components/policy/core/common/cloud/mock_device_management_service.h"

@@ -74,15 +74,7 @@ class DeviceCloudPolicyManagerChromeOSTest

state_keys_broker_(&fake_session_manager_client_,

base::MessageLoopProxy::current()),

store_(NULL) {

- EXPECT_CALL(mock_statistics_provider_,

- GetMachineStatistic(_, _))

- .WillRepeatedly(Return(false));

- EXPECT_CALL(mock_statistics_provider_,

- GetMachineStatistic("serial_number", _))

- .WillRepeatedly(DoAll(SetArgumentPointee<1>(std::string("test_sn")),

- Return(true)));

- chromeos::system::StatisticsProvider::SetTestProvider(

- &mock_statistics_provider_);

+ fake_statistics_provider_.SetMachineStatistic("serial_numer", "test_sn");

std::vector<std::string> state_keys;

state_keys.push_back("1");

state_keys.push_back("2");

@@ -191,7 +183,7 @@ class DeviceCloudPolicyManagerChromeOSTest

MockDeviceManagementService consumer_device_management_service_;

chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;

chromeos::ScopedTestCrosSettings test_cros_settings_;

- chromeos::system::MockStatisticsProvider mock_statistics_provider_;

+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;

chromeos::FakeSessionManagerClient fake_session_manager_client_;

chromeos::FakeCryptohomeClient* fake_cryptohome_client_;

ServerBackedStateKeysBroker state_keys_broker_;