Convert chrome_url_data_manager (previously a global) into a Singleton. This

chrome/browser/sync/sync_setup_wizard.cc

 // Copyright (c) 2006-2008 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/sync/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
+#include "base/singleton.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
 #include "grit/browser_resources.h"
@@ skipping 115 matching lines @@
 }
 
 SyncSetupWizard::SyncSetupWizard(ProfileSyncService* service)
     : service_(service),
       flow_container_(new SyncSetupFlowContainer()) {
   // Register data sources for HTML content we require.
   // g_browser_process and/or io_thread may not exist during testing.
   if (g_browser_process && g_browser_process->io_thread()) {
     // Add our network layer data source for 'cloudy' URLs.
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(&chrome_url_data_manager,
+        NewRunnableMethod(Singleton<ChromeURLDataManager>().get(),
                           &ChromeURLDataManager::AddDataSource,
                           new SyncResourcesSource()));
   }
 }
 
 SyncSetupWizard::~SyncSetupWizard() {
   delete flow_container_;
 }
 
 void SyncSetupWizard::Step(State advance_state) {
@@ skipping 32 matching lines @@
 }
 
 // static
 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(
     State start_state) {
   State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;
   DCHECK_NE(DONE, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }