Have content cancel requests for ResourceContexts when they shutdown, instead of depending on the e…

content/browser/in_process_webkit/indexed_db_context_impl.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CONTEXT_IMPL_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 68 matching lines @@
   quota::QuotaManagerProxy* quota_manager_proxy();
 
   FilePath data_path() const { return data_path_; }
 
   // For unit tests allow to override the |data_path_|.
   void set_data_path_for_testing(const FilePath& data_path) {
     data_path_ = data_path;
   }
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearLocalState);
-  FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearSessionOnlyDatabases);
-  FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, SaveSessionState);
+  FRIEND_TEST_ALL_PREFIXES(IndexedDBTest, ClearLocalState);
+  FRIEND_TEST_ALL_PREFIXES(IndexedDBTest, ClearSessionOnlyDatabases);
+  FRIEND_TEST_ALL_PREFIXES(IndexedDBTest, SaveSessionState);
   friend class IndexedDBQuotaClientTest;
 
   typedef std::map<GURL, int64> OriginToSizeMap;
   class IndexedDBGetUsageAndQuotaCallback;
 
   FilePath GetIndexedDBFilePath(const string16& origin_id) const;
   int64 ReadUsageFromDisk(const GURL& origin_url) const;
   void EnsureDiskUsageCacheInitialized(const GURL& origin_url);
   void QueryDiskAndUpdateQuotaUsage(const GURL& origin_url);
   void GotUsageAndQuota(const GURL& origin_url, quota::QuotaStatusCode,
@@ skipping 25 matching lines @@
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
   scoped_ptr<std::set<GURL> > origin_set_;
   OriginToSizeMap origin_size_map_;
   OriginToSizeMap space_available_map_;
   std::map<GURL, unsigned int> connection_count_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBContextImpl);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CONTEXT_IMPL_H_