Replace MockStatisticsProvider with FakeStatisticsProvider.

chrome/browser/extensions/external_provider_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/external_provider_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 #include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 #if defined(OS_CHROMEOS)
 #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 {
 
 namespace {
 
 using namespace net::test_server;
 
 const char kManifestPath[] = "/update_manifest";
 const char kAppPath[] = "/app.crx";
 
@@ skipping 39 matching lines @@
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&ExternalProviderImplTest::HandleRequest,
                    base::Unretained(this)));
 
     test_extension_cache_.reset(new ExtensionCacheFake());
 
     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:
   scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
     GURL url = test_server_->GetURL(request.relative_url);
     if (url.path() == kManifestPath) {
       scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse);
       response->set_code(net::HTTP_OK);
       response->set_content(base::StringPrintf(
           "<?xml version='1.0' encoding='UTF-8'?>\n"
@@ skipping 20 matching lines @@
       response->set_content(contents);
       return response.PassAs<HttpResponse>();
     }
 
     return scoped_ptr<HttpResponse>();
   }
 
   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
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplTest);
 };
 
 }  // namespace
 
 TEST_F(ExternalProviderImplTest, InAppPayments) {
   InitServiceWithExternalProviders();
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   service_->set_external_updates_finished_callback_for_test(
       runner->QuitClosure());
 
   service_->CheckForExternalUpdates();
   runner->Run();
 
   EXPECT_TRUE(service_->GetInstalledExtension(
       extension_misc::kInAppPaymentsSupportAppId));
   EXPECT_TRUE(service_->IsExtensionEnabled(
       extension_misc::kInAppPaymentsSupportAppId));
 }
 
 }  // namespace extensions