Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/browser/extensions/api/push_messaging/sync_setup_helper.cc

 // Copyright (c) 2012 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/api/push_messaging/sync_setup_helper.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/strings/string_util.h"
@@ skipping 11 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 SyncSetupHelper::SyncSetupHelper() {}
 
 SyncSetupHelper::~SyncSetupHelper() {}
 
 bool SyncSetupHelper::InitializeSync(Profile* profile) {
   profile_ = profile;
-  client_.reset(
-      ProfileSyncServiceHarness::Create(profile_, username_, password_));
+  client_.reset(new ProfileSyncServiceHarness(profile_, username_, password_));
 
   if (client_->service()->IsSyncEnabledAndLoggedIn())
     return true;
 
   if (!client_->SetupSync())
     return false;
 
   // Because clients may modify sync data as part of startup (for example local
   // session-releated data is rewritten), we need to ensure all startup-based
   // changes have propagated between the clients.
@@ skipping 29 matching lines @@
   return true;
 }
 
 bool SyncSetupHelper::AwaitQuiescence() {
   std::vector<ProfileSyncServiceHarness*> clients;
   clients.push_back(client_.get());
   return ProfileSyncServiceHarness::AwaitQuiescence(clients);
 }
 
 }  // namespace extensions