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

chrome/browser/dom_ui/new_tab_ui.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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 314 matching lines @@
     AddMessageHandler((new NewTabPageSetHomePageHandler())->Attach(this));
     AddMessageHandler((new NewTabPageClosePromoHandler())->Attach(this));
   }
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(html_source)));
 
   // Listen for theme installation.
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   // Listen for bookmark bar visibility changes.
   registrar_.Add(this, NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
                  NotificationService::AllSources());
 }
 
 NewTabUI::~NewTabUI() {
@@ skipping 64 matching lines @@
     case NotificationType::RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type.value;
   }
 }
 
 void NewTabUI::InitializeCSSCaches() {
-  Profile* profile = GetProfile();
-  WebUIThemeSource* theme = new WebUIThemeSource(profile);
-  profile->GetChromeURLDataManager()->AddDataSource(theme);
+  WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(theme)));
 }
 
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kNTPPrefVersion, 0);
 
   MostVisitedHandler::RegisterUserPrefs(prefs);
   ShownSectionsHandler::RegisterUserPrefs(prefs);
   if (NewTabUI::WebResourcesEnabled())
     TipsHandler::RegisterUserPrefs(prefs);
@@ skipping 158 matching lines @@
 
   scoped_refptr<RefCountedBytes> html_bytes(
       profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record));
 
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }