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

chrome/browser/prerender/prerender_unittest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ skipping 34 matching lines @@
     EXPECT_EQ(expected_final_status_, final_status());
   }
 
   virtual void StartPrerendering(
       int ALLOW_UNUSED creator_child_id,
       const gfx::Size& ALLOW_UNUSED size,
       content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
       bool is_control_group) OVERRIDE;
 
   virtual bool GetChildId(int* child_id) const OVERRIDE {
-    *child_id = 0;
+    // Having a default child_id of -1 forces pending prerenders not to fail
+    // on session storage and cross domain checking.
+    *child_id = -1;
     return true;
   }
 
   virtual bool GetRouteId(int* route_id) const OVERRIDE {
     *route_id = 0;
     return true;
   }
 
   FinalStatus expected_final_status() const { return expected_final_status_; }
 
@@ skipping 60 matching lines @@
 
   void AdvanceTimeTicks(TimeDelta delta) {
     time_ticks_ += delta;
   }
 
   DummyPrerenderContents* CreateNextPrerenderContents(
       const GURL& url,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
         new DummyPrerenderContents(this, prerender_tracker_, url,
-                                   ORIGIN_LINK_REL_PRERENDER,
+                                   ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
                                    expected_final_status);
     SetNextPrerenderContents(prerender_contents);
     return prerender_contents;
   }
 
   DummyPrerenderContents* CreateNextPrerenderContents(
       const GURL& url,
       Origin origin,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
         new DummyPrerenderContents(this, prerender_tracker_, url,
                                    origin, expected_final_status);
     SetNextPrerenderContents(prerender_contents);
     return prerender_contents;
   }
 
   DummyPrerenderContents* CreateNextPrerenderContents(
       const GURL& url,
       const std::vector<GURL>& alias_urls,
       FinalStatus expected_final_status) {
     DummyPrerenderContents* prerender_contents =
         new DummyPrerenderContents(this, prerender_tracker_, url,
-                                   ORIGIN_LINK_REL_PRERENDER,
+                                   ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
                                    expected_final_status);
     for (std::vector<GURL>::const_iterator it = alias_urls.begin();
          it != alias_urls.end();
          ++it) {
       EXPECT_TRUE(prerender_contents->AddAliasURL(*it));
     }
     SetNextPrerenderContents(prerender_contents);
     return prerender_contents;
   }
 
@@ skipping 983 matching lines @@
       prerender_manager()->CreateNextPrerenderContents(
           url, FINAL_STATUS_USED);
   EXPECT_TRUE(AddSimplePrerender(url));
   EXPECT_TRUE(second_prerender_contents->prerendering_has_started());
   ASSERT_EQ(second_prerender_contents,
             prerender_manager()->FindAndUseEntry(url));
   EXPECT_FALSE(IsEmptyPrerenderLinkManager());
 }
 
 }  // namespace prerender