Revert 74292 - Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/browser_signin.cc

 // Copyright (c) 2011 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/browser_signin.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 197 matching lines @@
     signin_->Cancel();
   }
   signin_->GetProfileSyncService()->OnUserSubmittedAuth(
       username, password, captcha, access_code);
 }
 
 BrowserSignin::BrowserSignin(Profile* profile)
     : profile_(profile),
       delegate_(NULL),
       html_dialog_ui_delegate_(NULL) {
-  // profile is NULL during testing.
-  if (profile) {
-    BrowserSigninResourcesSource* source = new BrowserSigninResourcesSource();
-    profile->GetChromeURLDataManager()->AddDataSource(source);
-  }
+  BrowserSigninResourcesSource* source = new BrowserSigninResourcesSource();
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                        &ChromeURLDataManager::AddDataSource,
+                        make_scoped_refptr(source)));
 }
 
 BrowserSignin::~BrowserSignin() {
   delegate_ = NULL;
 }
 
 void BrowserSignin::RequestSignin(TabContents* tab_contents,
                                   const string16& suggested_email,
                                   const string16& login_message,
                                   SigninDelegate* delegate) {
@@ skipping 89 matching lines @@
 
 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
 //  TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS)
   html_dialog_ui_delegate_ = CreateHtmlDialogUI();
   ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
                                                  html_dialog_ui_delegate_,
                                                  tab_contents);
 #endif
 }