Revert 238348 "Clean up TestProfileSyncService and related tests"

trunk/src/chrome/browser/ui/sync/one_click_signin_helper_unittest.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 "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ skipping 178 matching lines @@
    // Override ProfileSyncService::Shutdown() to avoid CHECK on
    // |invalidator_registrar_|.
    virtual void Shutdown() OVERRIDE {};
 
   private:
    explicit OneClickTestProfileSyncService(Profile* profile)
        : TestProfileSyncService(NULL,
                                 profile,
                                 NULL,
                                 NULL,
-                                ProfileSyncService::MANUAL_START),
+                                ProfileSyncService::MANUAL_START,
+                                false),  // synchronous_backend_init
          first_setup_in_progress_(false) {}
 
    bool first_setup_in_progress_;
 };
 
 }  // namespace
 
 class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
@@ skipping 681 matching lines @@
       prefs::kSigninAllowed, base::Value::CreateBooleanValue(true));
 
   // Simulate a policy disabling sync by writing kSyncManaged directly.
   // We should still offer to sign in the browser.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 valid_gaia_url_, std::string(), &request_, io_data.get()));
 }