Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/browser_shutdown.cc

Index: chrome/browser/browser_shutdown.cc
===================================================================
--- chrome/browser/browser_shutdown.cc	(revision 74178)
+++ chrome/browser/browser_shutdown.cc	(working copy)
@@ -173,6 +173,8 @@
   RLZTracker::CleanupRlz();
 #endif
 
+  ChromeURLDataManager::PrepareForShutdown();
+
   // The jank'o'meter requires that the browser process has been destroyed
   // before calling UninstallJankometer().
   delete g_browser_process;
@@ -250,16 +252,11 @@
     file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
   }
 
-  UnregisterURLRequestChromeJob();
-
 #if defined(OS_CHROMEOS)
   BrowserList::NotifyAndTerminate(false);
 #endif
 
-  // Clean up data sources before the UI thread is removed.
-  ChromeURLDataManager* data_manager = ChromeURLDataManager::GetInstance();
-  if (data_manager)
-    data_manager->RemoveAllDataSources();
+  ChromeURLDataManager::CompleteShutdown();
 }
 
 void ReadLastShutdownFile(