Replace MockStatisticsProvider with FakeStatisticsProvider.

chrome/browser/extensions/external_provider_impl_unittest.cc

Index: chrome/browser/extensions/external_provider_impl_unittest.cc
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index 20d0260f080951394a01c237149f6fe70e49235c..f51f61e2e982037b04c89ff9758dfacd2232d690 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -33,13 +33,13 @@
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#include "chromeos/system/mock_statistics_provider.h"
+#include "chromeos/system/fake_statistics_provider.h"
 #include "chromeos/system/statistics_provider.h"
 #endif
 
-using ::testing::_;
 using ::testing::NotNull;
 using ::testing::Return;
+using ::testing::_;
 
 namespace extensions {
 
@@ -99,19 +99,10 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase {
     CommandLine* cmdline = CommandLine::ForCurrentProcess();
     cmdline->AppendSwitchASCII(switches::kAppsGalleryUpdateURL,
                                test_server_->GetURL(kManifestPath).spec());
-#if defined(OS_CHROMEOS)
-    chromeos::system::StatisticsProvider::SetTestProvider(
-        &mock_statistics_provider_);
-    EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull()))
-        .WillRepeatedly(Return(false));
-#endif
   }
 
   virtual void TearDown() override {
-#if defined(OS_CHROMEOS)
-    chromeos::system::StatisticsProvider::SetTestProvider(NULL);
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
-#endif
   }
 
  private:
@@ -152,7 +143,7 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase {
   scoped_ptr<EmbeddedTestServer> test_server_;
   scoped_ptr<ExtensionCacheFake> test_extension_cache_;
 #if defined(OS_CHROMEOS)
-  chromeos::system::MockStatisticsProvider mock_statistics_provider_;
+  chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;

[stevenjb, 2014/10/13 14:28:20]

Is this used somewhere?

[Mattias Nissler (ping if slow), 2014/10/13 15:01:08]

Yes, added a clarifying comment.

[stevenjb, 2014/10/13 15:07:43]

Ah, right, I forgot that ScopedFakeStatisticsProvider registers itself globally.
This might be a little more clear as a scoped_ptr<> with explicit
initializiation in the constructor, but arguably that's implicit in the name of
the class, so I'm fine with it as-is.

   TestingPrefServiceSimple local_state_;
 #endif