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

chrome/browser/extensions/extension_function_dispatcher.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/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/process_util.h"
 #include "base/singleton.h"
@@ skipping 373 matching lines @@
   // Notify the ExtensionProcessManager that the view was created.
   ExtensionProcessManager* epm = profile()->GetExtensionProcessManager();
   epm->RegisterExtensionProcess(extension_id(),
                                 render_view_host->process()->id());
 
   // If the extension has permission to load chrome://favicon/ resources we need
   // to make sure that the WebUIFavIconSource is registered with the
   // ChromeURLDataManager.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIFavIconURL))) {
     WebUIFavIconSource* favicon_source = new WebUIFavIconSource(profile_);
-    profile_->GetChromeURLDataManager()->AddDataSource(favicon_source);
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        NewRunnableMethod(ChromeURLDataManager::GetInstance(),
+                          &ChromeURLDataManager::AddDataSource,
+                          make_scoped_refptr(favicon_source)));
   }
 
   // Update the extension permissions. Doing this each time we create an EFD
   // ensures that new processes are informed of permissions for newly installed
   // extensions.
   render_view_host->Send(new ViewMsg_Extension_SetAPIPermissions(
       extension->id(), extension->api_permissions()));
   render_view_host->Send(new ViewMsg_Extension_SetHostPermissions(
       extension->url(), extension->host_permissions()));
 
@@ skipping 92 matching lines @@
     NOTREACHED();
     UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_EFD"));
     base::KillProcess(render_view_host_->process()->GetHandle(),
                       ResultCodes::KILLED_BAD_MESSAGE, false);
   }
 }
 
 Profile* ExtensionFunctionDispatcher::profile() {
   return profile_;
 }