[Tests not passing yet] Remove prerender sessionStorage namespace merging.

chrome/browser/prerender/prerender_contents.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 CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 172 matching lines @@
   virtual bool GetChildId(int* child_id) const;
 
   // Sets the parameter to the value of the associated RenderViewHost's route id
   // and returns a boolean indicating the validity of that id.
   virtual bool GetRouteId(int* route_id) const;
 
   FinalStatus final_status() const { return final_status_; }
 
   Origin origin() const { return origin_; }
   uint8 experiment_id() const { return experiment_id_; }
-  int child_id() const { return child_id_; }
 
   base::TimeTicks load_start_time() const { return load_start_time_; }
 
   // Indicates whether this prerendered page can be used for the provided
   // |url| and |session_storage_namespace|.
   bool Matches(
       const GURL& url,
       const content::SessionStorageNamespace* session_storage_namespace) const;
 
   // content::WebContentsObserver implementation.
@@ skipping 55 matching lines @@
   base::Value* GetAsValue() const;
 
   // Returns whether a pending cross-site navigation is happening.
   // This could happen with renderer-issued navigations, such as a
   // MouseEvent being dispatched by a link to a website installed as an app.
   bool IsCrossSiteNavigationPending() const;
 
   // Marks prerender as used and releases any throttled resource requests.
   void PrepareForUse();
 
-  content::SessionStorageNamespace* GetSessionStorageNamespace() const;
-
   // Cookie events
   enum CookieEvent {
     COOKIE_EVENT_SEND = 0,
     COOKIE_EVENT_CHANGE = 1,
     COOKIE_EVENT_MAX
   };
 
   // Record a cookie transaction for this prerender contents.
   // In the event of cookies being sent, |earliest_create_date| contains
   // the time that the earliest of the cookies sent was created.
@@ skipping 148 matching lines @@
   uint8 experiment_id_;
 
   // The size of the WebView from the launching page.
   gfx::Size size_;
 
   typedef std::vector<history::HistoryAddPageArgs> AddPageVector;
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
-  // The alias session storage namespace for this prerender.
-  scoped_refptr<content::SessionStorageNamespace>
-      alias_session_storage_namespace;
-
   // Indicates what internal cookie events (see prerender_contents.cc) have
   // occurred, using 1 bit for each possible InternalCookieEvent.
   int cookie_status_;
 
   // Indicates whether existing cookies were sent for this prerender, and
   // whether they were third-party cookies, and whether they were for blocking
   // resources. See the enum CookieSendType in prerender_contents.cc
   int cookie_send_type_;
 
   // Resources that are throttled, pending a prerender use. Can only access a
   // throttle on the IO thread.
   std::vector<base::WeakPtr<PrerenderResourceThrottle> > resource_throttles_;
 
   // A running tally of the number of bytes this prerender has caused to be
   // transferred over the network for resources.  Updated with AddNetworkBytes.
   int64 network_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_