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

chrome/browser/browser_shutdown.cc

 // Copyright (c) 2010 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/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 239 matching lines @@
     // and then write it to a file to be read at startup.
     // We can't use prefs since all services are shutdown at this point.
     TimeDelta shutdown_delta = Time::Now() - shutdown_started_;
     std::string shutdown_ms =
         base::Int64ToString(shutdown_delta.InMilliseconds());
     int len = static_cast<int>(shutdown_ms.length()) + 1;
     FilePath shutdown_ms_file = GetShutdownMsPath();
     file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
   }
 
+  UnregisterURLRequestChromeJob();
+
 #if defined(OS_CHROMEOS)
   BrowserList::NotifyAndTerminate(false);
 #endif
 
-  ChromeURLDataManager::DeleteDataSources();
+  // Clean up data sources before the UI thread is removed.
+  ChromeURLDataManager* data_manager = ChromeURLDataManager::GetInstance();
+  if (data_manager)
+    data_manager->RemoveAllDataSources();
 }
 
 void ReadLastShutdownFile(
     ShutdownType type,
     int num_procs,
     int num_procs_slow) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   FilePath shutdown_ms_file = GetShutdownMsPath();
   std::string shutdown_ms_str;
@@ skipping 62 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown