Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/browser/memory_purger.cc

 // Copyright (c) 2012 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/memory_purger.h"
 
 #include <set>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/bind.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/resource_context.h"
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserContext;
@@ skipping 79 matching lines @@
 
     // Unload all history backends (freeing memory used to cache sqlite).
     // Spinning up the history service is expensive, so we avoid doing it if it
     // hasn't been done already.
     HistoryService* history_service =
         profiles[i]->GetHistoryServiceWithoutCreating();
     if (history_service)
       history_service->UnloadBackend();
 
     // Unload all web databases (freeing memory used to cache sqlite).
-    WebDataService* web_data_service =
-        profiles[i]->GetWebDataServiceWithoutCreating();
-    if (web_data_service)
+    scoped_refptr<WebDataService> web_data_service =
+        WebDataServiceFactory::GetForProfileIfExists(
+            profiles[i], Profile::EXPLICIT_ACCESS);
+    if (web_data_service.get())
       web_data_service->UnloadDatabase();
 
     BrowserContext::PurgeMemory(profiles[i]);
   }
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PurgeMemoryIOHelper::PurgeMemoryOnIOThread,
                  purge_memory_io_helper.get()));
 
@@ skipping 20 matching lines @@
           content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance())
     PurgeRendererForHost(i.GetCurrentValue());
 }
 
 // static
 void MemoryPurger::PurgeRendererForHost(content::RenderProcessHost* host) {
   // Direct the renderer to free everything it can.
   host->Send(new ChromeViewMsg_PurgeMemory());
 }