Fix SessionStorage

chrome/browser/tab_contents/navigation_controller.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_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #include <string>
 #include <vector>
 
 #include "base/linked_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_transition_types.h"
 
 class NavigationEntry;
 class Profile;
+class SessionStorageNamespace;
 class SiteInstance;
 class TabContents;
 class TabNavigation;
 struct ViewHostMsg_FrameNavigate_Params;
 
 // A NavigationController maintains the back-forward list for a single tab and
 // manages all navigation within that list.
 //
 // The NavigationController also owns all TabContents for the tab. This is to
 // make sure that we have at most one TabContents instance per type.
@@ skipping 96 matching lines @@
   };
 
   enum ReloadType {
     NO_RELOAD,                // Normal load.
     RELOAD,                   // Normal (cache-validating) reload.
     RELOAD_IGNORING_CACHE     // Reload bypassing the cache, aka shift-reload.
   };
 
   // ---------------------------------------------------------------------------
 
-  NavigationController(TabContents* tab_contents, Profile* profile);
+  // The session storage namespace parameter allows multiple render views and
+  // tab contentses to share the same session storage (part of the WebStorage
+  // spec) space. Passing in NULL simply allocates a new one which is often the
+  // correct thing to do (especially in tests.
+  NavigationController(TabContents* tab_contents,
+                       Profile* profile,
+                       SessionStorageNamespace* session_storage_namespace);
   ~NavigationController();
 
   // Returns the profile for this controller. It can never be NULL.
   Profile* profile() const {
     return profile_;
   }
 
   // Sets the profile for this controller.
   void set_profile(Profile* profile) {
     profile_ = profile;
@@ skipping 232 matching lines @@
   SSLManager* ssl_manager() { return &ssl_manager_; }
 
   // Returns true if a reload happens when activated (SetActive(true) is
   // invoked). This is true for session/tab restore and cloned tabs.
   bool needs_reload() const { return needs_reload_; }
 
   // Returns the largest restored page ID seen in this navigation controller,
   // if it was restored from a previous session.  (-1 otherwise)
   int32 max_restored_page_id() const { return max_restored_page_id_; }
 
-  // The session storage namespace id that all child render views should use.
-  int64 session_storage_namespace_id() const {
-    return session_storage_namespace_id_;
+  // The session storage namespace that all child render views should use.
+  SessionStorageNamespace* session_storage_namespace() const {
+    return session_storage_namespace_;
   }
 
   // Disables checking for a repost and prompting the user. This is used during
   // testing.
   static void DisablePromptOnRepost();
 
   // Maximum number of entries before we start removing entries from the front.
 #ifdef UNIT_TEST
   static void set_max_entry_count(size_t max_entry_count) {
     max_entry_count_ = max_entry_count;
@@ skipping 170 matching lines @@
   // across sessions.
   SessionID session_id_;
 
   // Unique identifier of the window we're in. Used by session restore.
   SessionID window_id_;
 
   // The time ticks at which the last document was loaded.
   base::TimeTicks last_document_loaded_;
 
   // The session storage id that any (indirectly) owned RenderView should use.
-  int64 session_storage_namespace_id_;
+  scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
 
   // Should Reload check for post data? The default is true, but is set to false
   // when testing.
   static bool check_for_repost_;
 
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_;
 
   // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
   // NO_RELOAD otherwise.
   ReloadType pending_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_