2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc
index 5a1e75b..2b9e732 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor.cc
@@ -138,7 +138,7 @@ void AutocompleteActionPredictor::ClearTransitionalMatches() {
 
 void AutocompleteActionPredictor::StartPrerendering(
     const GURL& url,
-    content::SessionStorageNamespace* session_storage_namespace,
+    const content::SessionStorageNamespaceMap& session_storage_namespace_map,
     const gfx::Size& size) {
   // Only cancel the old prerender after starting the new one, so if the URLs
   // are the same, the underlying prerender will be reused.
@@ -146,6 +146,11 @@ void AutocompleteActionPredictor::StartPrerendering(
       prerender_handle_.release());
   if (prerender::PrerenderManager* prerender_manager =
           prerender::PrerenderManagerFactory::GetForProfile(profile_)) {
+    content::SessionStorageNamespace* session_storage_namespace = NULL;
+    content::SessionStorageNamespaceMap::const_iterator it =
+        session_storage_namespace_map.find(std::string());
+    if (it != session_storage_namespace_map.end())
+      session_storage_namespace = it->second.get();
     prerender_handle_.reset(prerender_manager->AddPrerenderFromOmnibox(
         url, session_storage_namespace, size));
   }
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h
index 762d31a..b1c4f97 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor.h
+++ b/chrome/browser/predictors/autocomplete_action_predictor.h
@@ -98,7 +98,7 @@ class AutocompleteActionPredictor
   // prerenders (if any).
   void StartPrerendering(
       const GURL& url,
-      content::SessionStorageNamespace* session_storage_namespace,
+      const content::SessionStorageNamespaceMap& session_storage_namespace_map,
       const gfx::Size& size);
 
   // Return true if the suggestion type warrants a TCP/IP preconnection.