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

Unified Diff: chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

Issue 644413003: Replace MockStatisticsProvider with FakeStatisticsProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add clarifying comments. 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
Index: chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
index 235dd301007721dc04416cb44dfcbaca348b03b8..51a7489a689f7bf7e5648a71ccb22f8a45e5b0b4 100644
--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
@@ -19,15 +19,10 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
-#include "chromeos/system/mock_statistics_provider.h"
+#include "chromeos/system/fake_statistics_provider.h"
#include "chromeos/system/statistics_provider.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-using ::testing::_;
-using ::testing::NotNull;
-using ::testing::Return;
namespace extensions {
@@ -69,23 +64,17 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {
external_externsions_overrides_.reset(new base::ScopedPathOverride(
chrome::DIR_EXTERNAL_EXTENSIONS, data_dir().Append("external")));
-
- chromeos::system::StatisticsProvider::SetTestProvider(
- &mock_statistics_provider_);
- EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull()))
- .WillRepeatedly(Return(false));
}
virtual void TearDown() override {
chromeos::KioskAppManager::Shutdown();
- chromeos::system::StatisticsProvider::SetTestProvider(NULL);
TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
}
private:
TestingPrefServiceSimple local_state_;
scoped_ptr<base::ScopedPathOverride> external_externsions_overrides_;
- chromeos::system::MockStatisticsProvider mock_statistics_provider_;
+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
chromeos::FakeUserManager* fake_user_manager_;
chromeos::ScopedUserManagerEnabler scoped_user_manager_;

Powered by Google App Engine
This is Rietveld 408576698