Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/instant/instant_loader.cc

 // 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.
 
 #include "chrome/browser/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 75 matching lines @@
   // Only track the histogram for the instant loaders, for now.
   if (template_url_id) {
     base::Histogram* histogram = base::LinearHistogram::FactoryGet(
         "Instant.Previews" + group, 1, PREVIEW_NUM_TYPES, PREVIEW_NUM_TYPES + 1,
         base::Histogram::kUmaTargetedHistogramFlag);
     histogram->Add(usage);
   }
 }
 
 SessionStorageNamespace* GetSessionStorageNamespace(TabContents* tab) {
-  return tab->web_contents()->GetController().GetSessionStorageNamespace();
+  // TODO(ajwong): This is wrong because it assumes a default
+  // SessionStorageNamespace for a TabContents.
+  //
+  // http://crbug.com/140612
+  return tab->web_contents()->GetController()
+      .GetSessionStorageNamespaceMap().find("")->second;
 }
 
 }  // namespace
 
 // static
 const char* const InstantLoader::kInstantHeader = "X-Purpose";
 // static
 const char* const InstantLoader::kInstantHeaderValue = "instant";
 
 // FrameLoadObserver is responsible for determining if the page supports
@@ skipping 736 matching lines @@
 #endif
     }
     preview_contents_->web_contents()->SetDelegate(NULL);
     ready_ = false;
   }
   update_bounds_timer_.Stop();
   AddPreviewUsageForHistogram(template_url_id_,
       type == INSTANT_COMMIT_DESTROY ? PREVIEW_DELETED : PREVIEW_COMMITTED,
       group_);
   if (type != INSTANT_COMMIT_DESTROY) {
+    // This tracks the number of times a committed preview page destroys the
+    // Session Storage for the tab.
     base::Histogram* histogram = base::LinearHistogram::FactoryGet(
         "Instant.SessionStorageNamespace" + group_, 1, 2, 3,
         base::Histogram::kUmaTargetedHistogramFlag);
     histogram->Add(tab_contents == NULL || session_storage_namespace_ ==
         GetSessionStorageNamespace(tab_contents));
     // Now that the ownership is being passed to the caller, the thumbnailer
     // needs to resume taking thumbnails.
     if (preview_contents_->thumbnail_generator())
       preview_contents_->thumbnail_generator()->set_enabled(true);
   }
@@ skipping 273 matching lines @@
   preview_contents_->web_contents()->GetView()->SizeContents(tab_bounds.size());
 
   // Carry over the user agent override string.
   const std::string& override =
       tab_contents->web_contents()->GetUserAgentOverride();
   preview_contents_->web_contents()->SetUserAgentOverride(override);
 }
 
 void InstantLoader::CreatePreviewContents(TabContents* tab_contents) {
   WebContents* new_contents = WebContents::Create(
-      tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
+      tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL);
   preview_contents_.reset(new TabContents(new_contents));
   AddPreviewUsageForHistogram(template_url_id_, PREVIEW_CREATED, group_);
   session_storage_namespace_ = GetSessionStorageNamespace(tab_contents);
   preview_tab_contents_delegate_.reset(new WebContentsDelegateImpl(this));
   SetupPreviewContents(tab_contents);
 
   // TODO(beng): investigate if we can avoid this and instead rely on the
   //             visibility of the WebContentsView
   preview_contents_->web_contents()->WasShown();
 }
@@ skipping 36 matching lines @@
     host->Send(new ChromeViewMsg_SearchBoxResize(
         host->GetRoutingID(), GetOmniboxBoundsInTermsOfPreview()));
   } else {
     host->Send(new ChromeViewMsg_SearchBoxChange(
         host->GetRoutingID(), user_text, verbatim, 0, 0));
   }
 
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->web_contents(), user_text, verbatim));
 }