Separate same domain and cross domain <link rel=...> prerenders for reporting.

chrome/browser/prerender/prerender_manager.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_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 220 matching lines @@
           linked_ptr<PrerenderData>(new PrerenderData(this)));
       PrerenderHandle* prerender_handle =
           new PrerenderHandle(pending_prerender_list_.back().get());
       contents->AddPendingPrerender(
           prerender_handle->weak_ptr_factory_.GetWeakPtr(),
           url, referrer, size);
       return prerender_handle;
     }
   }
 
+  bool is_same_domain = false;
+  SessionStorageNamespace* session_storage_namespace = NULL;
   // Unit tests pass in a process_id == -1.
-  SessionStorageNamespace* session_storage_namespace = NULL;
   if (process_id != -1) {
     RenderViewHost* source_render_view_host =
         RenderViewHost::FromID(process_id, route_id);
     if (!source_render_view_host)
       return NULL;
     WebContents* source_web_contents =
         WebContents::FromRenderViewHost(source_render_view_host);
     if (!source_web_contents)
       return NULL;
+
+    if (source_web_contents->GetURL().host() == url.host())

[dominich, 2012/09/13 20:03:36]

shorter: is_same_domain = source_web_contents->GetURL().host() == url.host();

[gavinp, 2012/09/14 02:00:42]

Done.

+      is_same_domain = true;
     // TODO(ajwong): This does not correctly handle storage for isolated apps.
     session_storage_namespace =
         source_web_contents->GetController()
             .GetDefaultSessionStorageNamespace();
   }
 
-  return AddPrerender(ORIGIN_LINK_REL_PRERENDER,
+  return AddPrerender(is_same_domain ? ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN
+                                     : ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
                       process_id, url, referrer, size,
                       session_storage_namespace);
 #endif
 }
 
 PrerenderHandle* PrerenderManager::AddPrerenderFromOmnibox(
     const GURL& url,
     SessionStorageNamespace* session_storage_namespace,
     const gfx::Size& size) {
   if (!IsOmniboxEnabled(profile_))
@@ skipping 636 matching lines @@
     int process_id,
     const GURL& url_arg,
     const content::Referrer& referrer,
     const gfx::Size& size,
     SessionStorageNamespace* session_storage_namespace) {
   DCHECK(CalledOnValidThread());
 
   if (!IsEnabled())
     return NULL;
 
-  if (origin == ORIGIN_LINK_REL_PRERENDER &&
+  if (origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN &&
       IsGoogleSearchResultURL(referrer.url)) {
     origin = ORIGIN_GWS_PRERENDER;

[dominich, 2012/09/13 20:03:36]

GWS could be same-domain.

[gavinp, 2012/09/14 02:00:42]

That's true... But the goal here is to gather statistics on web prerenders, and
how they differ same vs cross origin. In gws, we already have so many ways we
limit prerendering... If we find there's huge cross/same domain differences in
web prerendering, perhaps we'll want to drill down in GWS, but for now I'm happy
leaving GWS monolithic. Does that make sense?

[dominich, 2012/09/14 14:40:45]

I'm suggesting changing the conditional, not the eventual value.

if ((origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN ||
     origin == ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN) &&
    IsGoogleSearchResultURL(referrer.url)) {
  origin = ORIGIN_GWS_PRERENDER;
}

[gavinp, 2012/09/14 21:10:47]

DOH. Reading comprehension fail. Thanks. I have now added that.

On 2012/09/14 14:40:45, dominich wrote:

   }
 
   DeleteOldEntries();
   DeletePendingDeleteEntries();
 
   GURL url = url_arg;
   GURL alias_url;
   uint8 experiment = GetQueryStringBasedExperiment(url_arg);
   bool control_group_behavior =
       IsControlGroup() || IsControlGroupExperiment(experiment);
@@ skipping 360 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender