Merge 162479 - Tell profile sync svc to use all datatypes when the user chooses the default

chrome/browser/ui/sync/one_click_signin_sync_starter.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/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 51 matching lines @@
   profile_sync_service->SetSetupInProgress(false);
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
   ProfileSyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetForProfile(browser_->profile());
 
   if (start_mode_ == SYNC_WITH_DEFAULT_SETTINGS) {
     // Just kick off the sync machine, no need to configure it first.
+    profile_sync_service->OnUserChoseDatatypes(true, syncer::ModelTypeSet());
     profile_sync_service->SetSyncSetupCompleted();
     profile_sync_service->SetSetupInProgress(false);
   } else {
     // Give the user a chance to configure things. We don't clear the
     // ProfileSyncService::setup_in_progress flag because we don't want sync
     // to start up until after the configure UI is displayed (the configure UI
     // will clear the flag when the user is done setting up sync).
     LoginUIServiceFactory::GetForProfile(browser_->profile())->ShowLoginUI(
         browser_);
   }
 
   delete this;
 }