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

chrome/browser/prerender/prerender_browsertest.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 <deque>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 196 matching lines @@
   TestPrerenderContents(
       PrerenderManager* prerender_manager,
       PrerenderTracker* prerender_tracker,
       Profile* profile,
       const GURL& url,
       const content::Referrer& referrer,
       int expected_number_of_loads,
       FinalStatus expected_final_status,
       bool prerender_should_wait_for_ready_title)
       : PrerenderContents(prerender_manager, prerender_tracker,
-                          profile, url, referrer, ORIGIN_LINK_REL_PRERENDER,
+                          profile, url, referrer,
+                          ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
                           PrerenderManager::kNoExperiment),
         number_of_loads_(0),
         expected_number_of_loads_(expected_number_of_loads),
         expected_final_status_(expected_final_status),
         new_render_view_host_(NULL),
         was_hidden_(false),
         was_shown_(false),
         should_be_shown_(expected_final_status == FINAL_STATUS_USED),
         quit_message_loop_on_destruction_(
             expected_final_status != FINAL_STATUS_EVICTED &&
@@ skipping 71 matching lines @@
     PrerenderContents::DidStopLoading(render_view_host);
     ++number_of_loads_;
     if (ShouldRenderPrerenderedPageCorrectly(expected_final_status_) &&
         number_of_loads_ == expected_number_of_loads_) {
       MessageLoopForUI::current()->Quit();
     }
   }
 
   virtual void AddPendingPrerender(
       base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+      const Origin origin,

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

nit: no need for const here.

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

It's not needed. But,
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Use_of...
tells me to to do this, and the only "overkill" example involves three const and
is not even described as "certainly" overkill, versus this use of just one
const.

[dominich, 2012/09/14 21:13:44]

If it was up to me, I'd const ALL the things. However, Chromium reviewers have
warned me off adding const to arguments passed by value as it doesn't add
anything to the API, and modern compilers don't rely on the keyword anyway.

Consider this a nit, and we'll move on.

[mmenke, 2012/09/17 20:39:27]

I actually think the style guide is ambiguous.  It lists 3 specific situations
where it makes sense to do so, and this is not one of them.  Does it "make
sense" to declare everything passed by value as const?  Is it "overkill"?  It's
unclear.

I tend to just go with the prevailing style.

       const GURL& url,
       const content::Referrer& referrer,
       const gfx::Size& size) OVERRIDE {
     PrerenderContents::AddPendingPrerender(
-        weak_prerender_handle, url, referrer, size);
+        weak_prerender_handle, origin, url, referrer, size);
     if (expected_pending_prerenders_ > 0 &&
         pending_prerenders().size() == expected_pending_prerenders_) {
       MessageLoop::current()->Quit();
     }
   }
 
   virtual WebContents* CreateWebContents(
       content::SessionStorageNamespace* session_storage_namespace) OVERRIDE {
     WebContents* web_contents = PrerenderContents::CreateWebContents(
         session_storage_namespace);
@@ skipping 2195 matching lines @@
   channel_close_watcher.WatchChannel(
       chrome::GetActiveWebContents(browser())->GetRenderProcessHost());
   NavigateToDestURL();
   channel_close_watcher.WaitForChannelClose();
 
   ASSERT_TRUE(IsEmptyPrerenderLinkManager());
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace prerender