Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/preferences_private/preferences_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/common/bookmark_constants.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/browser_context.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 using extensions::PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction;
 
 namespace {
 
 class FakeProfileSyncService : public ProfileSyncService {
  public:
   explicit FakeProfileSyncService(Profile* profile)
       : ProfileSyncService(
-            NULL,
+            new ProfileSyncComponentsFactoryMock(),

[sky, 2014/07/14 19:33:34]

Can the constructor take a scoped_ptr so that I don't have to wonder if you're
leaking ProfileSyncComponentsFactoryMock?

[stanisc, 2014/07/14 22:49:05]

This is a pre-existing issue, but I agree it makes sense to convert it to
scoped_ptr. Done.

             profile,
             make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
             ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
             browser_sync::MANUAL_START),
         sync_initialized_(true),
         initialized_state_violation_(false) {}
 
   virtual ~FakeProfileSyncService() {}
 
   static KeyedService* BuildFakeProfileSyncService(
@@ skipping 136 matching lines @@
 
 // Verifies that we wait for the sync service to be ready before checking
 // encryption status.
 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest,
                        GetSyncCategoriesWithoutPassphraseAsynchronous) {
   service_->set_sync_initialized(false);
   TestGetSyncCategoriesWithoutPassphraseFunction();
 }
 
 }  // namespace