Overhaul ntp_snippets_service_unittest.cc.

components/ntp_snippets/ntp_snippets_test_utils.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_TEST_UTILS_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_TEST_UTILS_H_
 
 #include <memory>
 
 #include "components/sync/driver/fake_sync_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class AccountTrackerService;
 class FakeSigninManagerBase;
 class MockSyncService;
 class TestingPrefServiceSimple;
 class TestSigninClient;
 
 namespace ntp_snippets {
 namespace test {
 
-class MockSyncService : public sync_driver::FakeSyncService {
+class FakeSyncService : public sync_driver::FakeSyncService {
  public:
-  MockSyncService();
-  ~MockSyncService() override;
+  FakeSyncService();
+  ~FakeSyncService() override;
 
   bool CanSyncStart() const override;
   bool IsSyncActive() const override;
   bool ConfigurationDone() const override;
   bool IsEncryptEverythingEnabled() const override;
   syncer::ModelTypeSet GetActiveDataTypes() const override;
 
   bool can_sync_start_;
   bool is_sync_active_;
   bool configuration_done_;
   bool is_encrypt_everything_enabled_;
   syncer::ModelTypeSet active_data_types_;
 };
 
-// Common base for snippet tests, handles initializing mocks for sync and
-// signin. |SetUp()| should be called if a subclass overrides it.
-class NTPSnippetsTestBase : public testing::Test {
+// Common utilities for snippet tests, handles initializing fakes for sync and
+// signin.
+class NTPSnippetsTestUtils {
  public:
-  void SetUp() override;
+  NTPSnippetsTestUtils();
+  ~NTPSnippetsTestUtils();
 
- protected:
-  NTPSnippetsTestBase();
-  ~NTPSnippetsTestBase() override;
   void ResetSigninManager();
 
-  MockSyncService* mock_sync_service() { return mock_sync_service_.get(); }
+  FakeSyncService* fake_sync_service() { return fake_sync_service_.get(); }
   FakeSigninManagerBase* fake_signin_manager() {
     return fake_signin_manager_.get();
   }
   TestingPrefServiceSimple* pref_service() { return pref_service_.get(); }
 
  private:
   std::unique_ptr<FakeSigninManagerBase> fake_signin_manager_;
-  std::unique_ptr<MockSyncService> mock_sync_service_;
+  std::unique_ptr<FakeSyncService> fake_sync_service_;
   std::unique_ptr<TestingPrefServiceSimple> pref_service_;
   std::unique_ptr<TestSigninClient> signin_client_;
   std::unique_ptr<AccountTrackerService> account_tracker_;
 };
 
 }  // namespace test
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_TEST_UTILS_H_