Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Issue 25112004: Move statistics_provider to chromeos/system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comments 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
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 96904ae7a3625e858fe61c3c1f9ebe2a34f3b642..9973c46022019652de504640bf534b502e437968 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
@@ -28,6 +28,8 @@
#include "chromeos/cryptohome/cryptohome_library.h"
#include "chromeos/dbus/dbus_client_implementation_type.h"
#include "chromeos/dbus/fake_cryptohome_client.h"
+#include "chromeos/system/mock_statistics_provider.h"
+#include "chromeos/system/statistics_provider.h"
#include "google_apis/gaia/gaia_oauth_client.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_request_test_util.h"
@@ -39,7 +41,9 @@ using testing::AnyNumber;
using testing::AtMost;
using testing::DoAll;
using testing::Mock;
+using testing::Return;
using testing::SaveArg;
+using testing::SetArgumentPointee;
using testing::_;
namespace em = enterprise_management;
@@ -67,6 +71,18 @@ class DeviceCloudPolicyManagerChromeOSTest
loop_.message_loop_proxy(),
&install_attributes_) {
fake_cryptohome_client_->Init(NULL /* no dbus::Bus */);
+ 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_);
+ }
+ virtual ~DeviceCloudPolicyManagerChromeOSTest() {
+ chromeos::system::StatisticsProvider::SetTestProvider(NULL);
}
virtual void SetUp() OVERRIDE {
@@ -113,6 +129,7 @@ class DeviceCloudPolicyManagerChromeOSTest
MockDeviceManagementService device_management_service_;
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
chromeos::ScopedTestCrosSettings test_cros_settings_;
+ chromeos::system::MockStatisticsProvider mock_statistics_provider_;
DeviceCloudPolicyStoreChromeOS* store_;
DeviceCloudPolicyManagerChromeOS manager_;

Powered by Google App Engine
This is Rietveld 408576698