Remove prerender sessionStorage namespace merging (1/2)

chrome/browser/prerender/prerender_contents.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/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 303 matching lines @@
   if (prerender_manager_->IsControlGroup(experiment_id()))
     return;
 
   if (origin_ == ORIGIN_LOCAL_PREDICTOR &&
       IsLocalPredictorPrerenderAlwaysControlEnabled()) {
     return;
   }
 
   prerendering_has_started_ = true;
 
-  alias_session_storage_namespace = session_storage_namespace->CreateAlias();
-  prerender_contents_.reset(
-      CreateWebContents(alias_session_storage_namespace.get()));
+  prerender_contents_.reset(CreateWebContents(session_storage_namespace));
   TabHelpers::AttachTabHelpers(prerender_contents_.get());
   content::WebContentsObserver::Observe(prerender_contents_.get());
 
   web_contents_delegate_.reset(new WebContentsDelegateImpl(this));
   prerender_contents_.get()->SetDelegate(web_contents_delegate_.get());
   // Set the size of the prerender WebContents.
   ResizeWebContents(prerender_contents_.get(), size_);
 
   child_id_ = GetRenderViewHost()->GetProcess()->GetID();
   route_id_ = GetRenderViewHost()->GetRoutingID();
 
-  // Log transactions to see if we could merge session storage namespaces in
-  // the event of a mismatch.
-  alias_session_storage_namespace->AddTransactionLogProcessId(child_id_);
-
   // Add the RenderProcessHost to the Prerender Manager.
   prerender_manager()->AddPrerenderProcessHost(
       GetRenderViewHost()->GetProcess());
 
   // In the prerender tracker, create a Prerender Cookie Store to keep track of
   // cookie changes performed by the prerender. Once the prerender is shown,
   // the cookie changes will be committed to the actual cookie store,
   // otherwise, they will be discarded.
   // If |request_context| is NULL, the feature must be disabled, so the
   // operation will not be performed.
@@ skipping 228 matching lines @@
     content::RenderProcessHost* host = host_iterator.GetCurrentValue();
     host->Send(new PrerenderMsg_OnPrerenderAddAlias(url));
   }
 
   return true;
 }
 
 bool PrerenderContents::Matches(
     const GURL& url,
     const SessionStorageNamespace* session_storage_namespace) const {
   if (session_storage_namespace &&

[mmenke, 2014/12/12 16:04:48]

I believe the "session_storage_namespace &&" should now be removed.

[davidben, 2014/12/12 20:41:19]

There's still places that pass in NULL. Though I think, apart from tests, it's
just PrerenderLocalPredictor that I still need to tease apart. I'll add a TODO.

       session_storage_namespace_id_ != session_storage_namespace->id()) {
     return false;
   }
   return std::count_if(alias_urls_.begin(), alias_urls_.end(),
                        std::bind2nd(std::equal_to<GURL>(), url)) != 0;
 }
 
 void PrerenderContents::RenderProcessGone(base::TerminationStatus status) {
   Destroy(FINAL_STATUS_RENDERER_CRASHED);
 }
@@ skipping 137 matching lines @@
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes) &&
       private_bytes > prerender_manager_->config().max_bytes) {
     Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
   }
 }
 
 WebContents* PrerenderContents::ReleasePrerenderContents() {
   prerender_contents_->SetDelegate(NULL);
   content::WebContentsObserver::Observe(NULL);
-  if (alias_session_storage_namespace.get())
-    alias_session_storage_namespace->RemoveTransactionLogProcessId(child_id_);
   return prerender_contents_.release();
 }
 
 RenderViewHost* PrerenderContents::GetRenderViewHostMutable() {
   return const_cast<RenderViewHost*>(GetRenderViewHost());
 }
 
 const RenderViewHost* PrerenderContents::GetRenderViewHost() const {
   if (!prerender_contents_.get())
     return NULL;
@@ skipping 41 matching lines @@
 
   NotifyPrerenderStop();
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ResumeThrottles, resource_throttles_));
   resource_throttles_.clear();
 }
 
-SessionStorageNamespace* PrerenderContents::GetSessionStorageNamespace() const {
-  if (!prerender_contents())
-    return NULL;
-  return prerender_contents()->GetController().
-      GetDefaultSessionStorageNamespace();
-}
-
 void PrerenderContents::OnCancelPrerenderForPrinting() {
   Destroy(FINAL_STATUS_WINDOW_PRINT);
 }
 
 void PrerenderContents::RecordCookieEvent(CookieEvent event,
                                           bool is_main_frame_http_request,
                                           bool is_third_party_cookie,
                                           bool is_for_blocking_resource,
                                           base::Time earliest_create_date) {
   // We don't care about sent cookies that were created after this prerender
@@ skipping 55 matching lines @@
  void PrerenderContents::AddResourceThrottle(
      const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
    resource_throttles_.push_back(throttle);
  }
 
  void PrerenderContents::AddNetworkBytes(int64 bytes) {
    network_bytes_ += bytes;
  }
 
 }  // namespace prerender