Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.

chrome/browser/ui/browser_tabrestore.cc

Index: chrome/browser/ui/browser_tabrestore.cc
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index 9bb737a4d97ea4e407d2d7c44a843ea1ec5aa9d9..a949fc56fec1bfa63b1989487fdda7420b2e7c61 100644
--- a/chrome/browser/ui/browser_tabrestore.cc
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/session_storage_namespace.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
@@ -45,13 +44,6 @@ WebContents* CreateRestoredTab(
     content::SessionStorageNamespace* session_storage_namespace,
     const std::string& user_agent_override) {
   GURL restore_url = navigations.at(selected_navigation).virtual_url();
-  // TODO(ajwong): Remove the temporary session_storage_namespace_map when
-  // we teach session restore to understand that one tab can have multiple
-  // SessionStorageNamespace objects. Also remove the
-  // session_storage_namespace.h include since we only need that to assign
-  // into the map.
-  content::SessionStorageNamespaceMap session_storage_namespace_map;
-  session_storage_namespace_map[std::string()] = session_storage_namespace;
   WebContents::CreateParams create_params(
       browser->profile(),
       tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url));
@@ -63,7 +55,7 @@ WebContents* CreateRestoredTab(
   }
   WebContents* web_contents = content::WebContents::CreateWithSessionStorage(
       create_params,
-      session_storage_namespace_map);
+      session_storage_namespace);
   extensions::TabHelper::CreateForWebContents(web_contents);
   extensions::TabHelper::FromWebContents(web_contents)->
       SetExtensionAppById(extension_app_id);