Attempt 3 at: Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/remoting/setup_flow.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/remoting/setup_flow.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 98 matching lines @@
   ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript);
 
   flow()->web_ui()->CallJavascriptFunction(L"showSetupDone");
 
   ExecuteJavascriptInIFrame(kDoneIframeXPath, L"onPageShown();");
 }
 
 SetupFlowContext::SetupFlowContext() { }
 SetupFlowContext::~SetupFlowContext() { }
 
-SetupFlow::SetupFlow(const std::string& args, Profile* profile,
+SetupFlow::SetupFlow(const std::string& args,
+                     Profile* profile,
                      SetupFlowStep* first_step)
     : web_ui_(NULL),
       dialog_start_args_(args),
       profile_(profile),
       current_step_(first_step) {
   // TODO(hclam): The data source should be added once.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(ChromeURLDataManager::GetInstance(),
-                        &ChromeURLDataManager::AddDataSource,
-                        make_scoped_refptr(new RemotingResourcesSource())));
+  profile->GetChromeURLDataManager()->AddDataSource(
+      new RemotingResourcesSource());
 }
 
 SetupFlow::~SetupFlow() { }
 
 // static
 SetupFlow* SetupFlow::OpenSetupDialog(Profile* profile) {
   // Set the arguments for showing the gaia login page.
   DictionaryValue args;
   args.SetString("iframeToShow", "login");
   args.SetString("user", "");
@@ skipping 119 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         new DeleteTask<SetupFlowStep>(current_step_.release()));
   }
 
   current_step_.reset(next_step);
   StartCurrentStep();
 }
 
 }  // namespace remoting