Replace ancient crufty AppCacheThread with much improved MessageLoopProxy usage.

webkit/appcache/appcache_storage_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 WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 #define WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/task.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_disk_cache.h"
 #include "webkit/appcache/appcache_storage.h"
 
 namespace appcache {
 
 class AppCacheStorageImpl : public AppCacheStorage {
  public:
   explicit AppCacheStorageImpl(AppCacheService* service);
   virtual ~AppCacheStorageImpl();
 
   void Initialize(const FilePath& cache_directory,
+                  base::MessageLoopProxy* db_thread,
                   base::MessageLoopProxy* cache_thread);
   void Disable();
   bool is_disabled() const { return is_disabled_; }
 
   // AppCacheStorage methods, see the base class for doc comments.
   virtual void GetAllInfo(Delegate* delegate);
   virtual void LoadCache(int64 id, Delegate* delegate);
   virtual void LoadOrCreateGroup(const GURL& manifest_url, Delegate* delegate);
   virtual void StoreGroupAndNewestCache(
       AppCacheGroup* group, AppCache* newest_cache, Delegate* delegate);
@@ skipping 77 matching lines @@
   void CallOnMainResponseFound(
       DelegateReferenceVector* delegates,
       const GURL& url, const AppCacheEntry& entry,
       const GURL& fallback_url, const AppCacheEntry& fallback_entry,
       int64 cache_id, const GURL& manifest_url);
 
   AppCacheDiskCache* disk_cache();
 
   // The directory in which we place files in the file system.
   FilePath cache_directory_;
+  bool is_incognito_;

[Dirk Pranke, 2011/09/09 22:40:19]

Nit: any particular reason you moved this up? Because cache_directory_ isn't
used when in incognito mode, and you wanted the two to be together?

[michaeln, 2011/09/09 23:25:36]

The two i smushed together, cache_directory_ and is_incognito_, both have to do
with where stuff is stored. The (now two) message_loop ptrs don't have anything
to do with that. That cache_thread_ member probably shouldn't have been put
where it was to start with (but there was no compelling reason to change it
since it wasn't broke).

+
+  // This class operates primarily on the io thread, but schedules
+  // its DatabaseTasks on the db thread. Seperately, the disk_cache uses
+  // the cache_thread.
+  scoped_refptr<base::MessageLoopProxy> db_thread_;
   scoped_refptr<base::MessageLoopProxy> cache_thread_;
-  bool is_incognito_;
 
   // Structures to keep track of DatabaseTasks that are in-flight.
   DatabaseTaskQueue scheduled_database_tasks_;
   PendingCacheLoads pending_cache_loads_;
   PendingGroupLoads pending_group_loads_;
   PendingForeignMarkings pending_foreign_markings_;
   PendingQuotaQueries pending_quota_queries_;
 
   // Structures to keep track of lazy response deletion.
   std::deque<int64> deletable_response_ids_;
@@ skipping 20 matching lines @@
   // any tasks on the background database thread.
   std::deque<Task*> pending_simple_tasks_;
   ScopedRunnableMethodFactory<AppCacheStorageImpl> method_factory_;
 
   friend class ChromeAppCacheServiceTest;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_