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

chrome/browser/chromeos/dom_ui/menu_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 "chrome/browser/chromeos/dom_ui/menu_ui.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/views/native_menu_webui.h"
 #include "chrome/browser/chromeos/views/webui_menu_widget.h"
 #include "chrome/browser/dom_ui/web_ui_util.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "grit/app_resources.h"
 #include "grit/browser_resources.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 491 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuUI::MenuUI(TabContents* contents) : DOMUI(contents) {
   MenuHandler* handler = new MenuHandler();
   AddMessageHandler((handler)->Attach(this));
 
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(
-      CreateDataSource());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(CreateDataSource())));
 }
 
 MenuUI::MenuUI(TabContents* contents, ChromeURLDataManager::DataSource* source)
     : DOMUI(contents) {
   MenuHandler* handler = new MenuHandler();
   AddMessageHandler((handler)->Attach(this));
 
-  contents->profile()->GetChromeURLDataManager()->AddDataSource(source);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          ChromeURLDataManager::GetInstance(),
+          &ChromeURLDataManager::AddDataSource,
+          make_scoped_refptr(source)));
 }
 
 void MenuUI::ModelUpdated(const ui::MenuModel* model) {
   DictionaryValue json_model;
   ListValue* items = new ListValue();
   json_model.Set("items", items);
   int max_icon_width = 0;
   bool has_accelerator = false;
   for (int index = 0; index < model->GetItemCount(); ++index) {
     ui::MenuModel::ItemType type = model->GetTypeAt(index);
@@ skipping 91 matching lines @@
 
 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {
   return CreateMenuUIHTMLSource(NULL,
                                 chrome::kChromeUIMenu,
                                 "Menu" /* class name */,
                                 kNoExtraResource,
                                 kNoExtraResource);
 }
 
 }  // namespace chromeos