Integrate the new DomStorage backend into DRT and test_shell.

webkit/dom_storage/dom_storage_context.h

 // Copyright (c) 2012 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_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 #define WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 #pragma once
 
 #include <map>
 
@@ skipping 82 matching lines @@
       const GURL& page_url);
   void NotifyItemRemoved(
       const DomStorageArea* area,
       const string16& key,
       const string16& old_value,
       const GURL& page_url);
   void NotifyAreaCleared(
       const DomStorageArea* area,
       const GURL& page_url);
 
- private:
-  friend class DomStorageSession;
-  friend class base::RefCountedThreadSafe<DomStorageContext>;
-  typedef std::map<int64, scoped_refptr<DomStorageNamespace> >
-      StorageNamespaceMap;
-
-  ~DomStorageContext();
-
   // May be called on any thread.
   int64 AllocateSessionId() {
     return session_id_sequence_.GetNext();
   }
 
   // Must be called on the background thread.
   void CreateSessionNamespace(int64 namespace_id);
   void DeleteSessionNamespace(int64 namespace_id);
   void CloneSessionNamespace(int64 existing_id, int64 new_id);
 
+ private:
+  friend class base::RefCountedThreadSafe<DomStorageContext>;
+  typedef std::map<int64, scoped_refptr<DomStorageNamespace> >
+      StorageNamespaceMap;
+
+  ~DomStorageContext();
+
   // Collection of namespaces keyed by id.
   StorageNamespaceMap namespaces_;
 
   // Where localstorage data is stored, maybe empty for the incognito use case.
   FilePath directory_;
 
   // Used to schedule sequenced background tasks.
   scoped_refptr<DomStorageTaskRunner> task_runner_;
 
   // List of objects observing local storage events.
   ObserverList<EventObserver> event_observers_;
 
   // We use a 32 bit identifier for per tab storage sessions.
   // At a tab per second, this range is large enough for 68 years.
   base::AtomicSequenceNumber session_id_sequence_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_