Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/browser/browser_context.h" | 5 #include "content/public/browser/browser_context.h" |
| 6 | 6 |
| 7 #include "content/browser/appcache/chrome_appcache_service.h" | 7 #include "content/browser/appcache/chrome_appcache_service.h" |
| 8 #include "content/browser/fileapi/browser_file_system_helper.h" | 8 #include "content/browser/fileapi/browser_file_system_helper.h" |
| 9 #include "content/browser/in_process_webkit/dom_storage_context_impl.h" | 9 #include "content/browser/in_process_webkit/dom_storage_context_impl.h" |
| 10 #include "content/browser/in_process_webkit/indexed_db_context_impl.h" | 10 #include "content/browser/in_process_webkit/indexed_db_context_impl.h" |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 241 BrowserContext::~BrowserContext() { | 241 BrowserContext::~BrowserContext() { |
| 242 // These message loop checks are just to avoid leaks in unittests. | 242 // These message loop checks are just to avoid leaks in unittests. |
| 243 if (GetUserData(kDatabaseTrackerKeyName) && | 243 if (GetUserData(kDatabaseTrackerKeyName) && |
| 244 BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) { | 244 BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) { |
| 245 BrowserThread::PostTask( | 245 BrowserThread::PostTask( |
| 246 BrowserThread::FILE, FROM_HERE, | 246 BrowserThread::FILE, FROM_HERE, |
| 247 base::Bind(&webkit_database::DatabaseTracker::Shutdown, | 247 base::Bind(&webkit_database::DatabaseTracker::Shutdown, |
| 248 GetDatabaseTracker(this))); | 248 GetDatabaseTracker(this))); |
| 249 } | 249 } |
| 250 | 250 |
| 251 if (GetUserData(kDOMStorageContextKeyName) && | 251 if (GetUserData(kDOMStorageContextKeyName)) { |
| 252 BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) { | 252 DOMStorageContext* context = |
| 253 DOMStorageContext* dom_storage_context = | |
| 254 (static_cast<UserDataAdapter<DOMStorageContext>*>( | 253 (static_cast<UserDataAdapter<DOMStorageContext>*>( |
| 255 GetUserData(kDOMStorageContextKeyName)))->release(); | 254 GetUserData(kDOMStorageContextKeyName)))->release(); |
| 256 BrowserThread::ReleaseSoon( | 255 context->task_runner()->ReleaseSoon(FROM_HERE, context); |
|
michaeln
2012/03/14 05:17:26
to make the browser/ui/unittest gods happy, may ha
michaeln
2012/03/14 05:18:59
or maybe all relevant tests have been marked flaky
| |
| 257 BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, dom_storage_context); | |
| 258 } | 256 } |
| 259 } | 257 } |
| 260 | 258 |
| 261 } // namespace content | 259 } // namespace content |
| OLD | NEW |