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

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2009 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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
+#include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
 #include "chrome/browser/dom_ui/most_visited_handler.h"
 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/dom_ui/tips_handler.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 517 matching lines @@
 
   InitializeCSSCaches();
   if (GetProfile()->IsOffTheRecord()) {
     incognito_ = true;
 
     IncognitoTabHTMLSource* html_source = new IncognitoTabHTMLSource(
         GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar));
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(
-            &chrome_url_data_manager,
+            Singleton<ChromeURLDataManager>().get(),
             &ChromeURLDataManager::AddDataSource,
             html_source));
   } else {
     AddMessageHandler((new ShownSectionsHandler())->Attach(this));
     AddMessageHandler((new MostVisitedHandler())->Attach(this));
     AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
     AddMessageHandler((new MetricsHandler())->Attach(this));
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
 
 #if !defined(OS_POSIX)
     if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }
 #endif
 
     AddMessageHandler((new NewTabPageSetHomepageHandler())->Attach(this));
 
     NewTabHTMLSource* html_source = new NewTabHTMLSource(GetProfile());
     bool posted = ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(
-            &chrome_url_data_manager,
+            Singleton<ChromeURLDataManager>().get(),
             &ChromeURLDataManager::AddDataSource,
             html_source));
     if (!posted) {
       html_source->AddRef();
       html_source->Release();  // Keep Valgrind happy in tests.
     }
   }
 
   // Listen for theme installation.
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
@@ skipping 26 matching lines @@
     else
       CallJavascriptFunction(L"bookmarkBarDetached");
   }
 }
 
 void NewTabUI::InitializeCSSCaches() {
   DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
   bool posted = ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
-          &chrome_url_data_manager,
+          Singleton<ChromeURLDataManager>().get(),
           &ChromeURLDataManager::AddDataSource,
           theme));
   if (!posted) {
     theme->AddRef();
     theme->Release();  // Keep Valgrind happy in tests.
   }
 }
 
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
@@ skipping 313 matching lines @@
     full_html_.append(json_html);
     size_t after_offset = pos + template_data_placeholder.size();
     full_html_.append(new_tab_html.data() + after_offset,
                       new_tab_html.size() - after_offset);
   } else {
     NOTREACHED();
     full_html_.assign(new_tab_html.data(), new_tab_html.size());
   }
   jstemplate_builder::AppendI18nTemplateProcessHtml(&full_html_);
 }