diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:54:15 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:54:15 +0000 |
| commit | ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a (patch) | |
| tree | b7e5213fb01b0f422bb2fd0eb7da523c08de717a /chrome/browser/memory_purger.cc | |
| parent | 2a6f339074bff557adb5253d7165b493a5d758ee (diff) | |
| download | chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.zip chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.tar.gz chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.tar.bz2 | |
Taking over issue 10006037.
Moved WebDataService to ProfileKeyedService
James:
chrome\browser\ui\intents
Peter:
chrome\browser\ui\search_engines
chrome\browser\search_engines
Nicolas:
chrome\browser\sync
Rachel/Elliot:
chrome\browser\profiles and the whole cl
BUG=112234
TEST=unit-tests
TBR=jhawkins@chromium.org,pkasting@chromium.org,zea@chromium.org,erg@chromium.org,isherman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10185008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_purger.cc')
| -rw-r--r-- | chrome/browser/memory_purger.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index 21cf2e9..d00ee17 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -15,6 +15,7 @@ #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" @@ -114,9 +115,10 @@ void MemoryPurger::PurgeBrowser() { 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]); |