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

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.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/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 4ee660a0f69c7de7536bcddf5d8022cc1314c617..a182cb27dd98efd7cdc1bb0255b0767f75604bab 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -49,6 +49,8 @@
#include "chromeos/disks/mock_disk_mount_manager.h"
#include "chromeos/login/login_state.h"
#include "chromeos/network/network_handler.h"
+#include "chromeos/system/mock_statistics_provider.h"
+#include "chromeos/system/statistics_provider.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_utils.h"
@@ -216,6 +218,11 @@ class LoginUtilsTest : public testing::Test,
CryptohomeLibrary::Initialize();
LoginState::Initialize();
+ EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, _))
+ .WillRepeatedly(Return(false));
+ chromeos::system::StatisticsProvider::SetTestProvider(
+ &mock_statistics_provider_);
+
mock_input_method_manager_ = new input_method::MockInputMethodManager();
input_method::InitializeForTesting(mock_input_method_manager_);
disks::DiskMountManager::InitializeForTesting(&mock_disk_mount_manager_);
@@ -478,6 +485,8 @@ class LoginUtilsTest : public testing::Test,
cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;
+ chromeos::system::MockStatisticsProvider mock_statistics_provider_;
+
policy::BrowserPolicyConnector* connector_;
// Initialized after |mock_dbus_thread_manager_| is set up.
« no previous file with comments | « chrome/browser/chromeos/login/hwid_checker.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698