Moved deleting the indexed db context to the WebKitContext destructor.

chrome/browser/in_process_webkit/webkit_context.h

 // Copyright (c) 2010 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 CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CONTEXT_H_
 #define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CONTEXT_H_
 #pragma once
 
 #include <vector>
 
 #include "base/file_path.h"
+#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/in_process_webkit/indexed_db_context.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
+#include "chrome/common/notification_observer.h"
 
 class Profile;
 
 // There's one WebKitContext per profile.  Various DispatcherHost classes
 // have a pointer to the Context to store shared state.  Unfortunately, this
 // class has become a bit of a dumping ground for calls made on the UI thread
 // that need to be proxied over to the WebKit thread.
 //
 // This class is created on the UI thread and accessed on the UI, IO, and WebKit
 // threads.
-class WebKitContext : public base::RefCountedThreadSafe<WebKitContext> {
+class WebKitContext
+    : public NotificationObserver,

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

notification observer is a pure virtual class, refcountedthreadsafe is not. the
coding style says that non-pure virtual classes should come first

[pastarmovj, 2010/11/27 20:45:15]

Done.

+      public base::RefCountedThreadSafe<WebKitContext> {
  public:
   explicit WebKitContext(Profile* profile);
 
   const FilePath& data_path() const { return data_path_; }
   bool is_incognito() const { return is_incognito_; }
+  bool clear_on_exit() const;
 
   DOMStorageContext* dom_storage_context() {
     return dom_storage_context_.get();
   }
 
   IndexedDBContext* indexed_db_context() {
     return indexed_db_context_.get();
   }
 
 #ifdef UNIT_TEST
@@ skipping 10 matching lines @@
   // Tell all children (where applicable) to delete any objects that were
   // last modified on or after the following time.
   void DeleteDataModifiedSince(const base::Time& cutoff,
                                const char* url_scheme_to_be_skipped,
                                const std::vector<string16>& protected_origins);
 
   // Delete the session storage namespace associated with this id.  Can be
   // called from any thread.
   void DeleteSessionStorageNamespace(int64 session_storage_namespace_id);
 
+  // NotificationObserver implementation.
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
  private:
   friend class base::RefCountedThreadSafe<WebKitContext>;
   ~WebKitContext();
 
   // Copies of profile data that can be accessed on any thread.
   const FilePath data_path_;
   const bool is_incognito_;
 
+  // Used around accesses to the clear_on_exit_ flag to guarantee thread safety.
+  mutable Lock lock_;
+  // When set the destructors of context objects will delete its files.
+  bool clear_on_exit_;

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

I'd name this something like clear_local_state_on_exit_. Also the comment should
be "True if ..."

[pastarmovj, 2010/11/27 20:45:15]

Done. I felt it would have been way too long and clear_on_exit was conveying
enough meaning but maybe it is a bit misleading as of what is really cleared and
it is certainly not the webkit context itself.

+
+  Profile* profile_;

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

what do you need to profile for?

[pastarmovj, 2010/11/27 20:45:15]

For the Observer to be able to extract the new pref value from the profile.
Added comment about that in the code too.

+  PrefChangeRegistrar pref_change_registrar_;
+
   scoped_ptr<DOMStorageContext> dom_storage_context_;
 
   scoped_ptr<IndexedDBContext> indexed_db_context_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebKitContext);
 };
 
 #endif  // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CONTEXT_H_