For the MatchComplete PPLT change in prerendering,

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2011 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 <utility>
 
 #include "base/process_util.h"
@@ skipping 479 matching lines @@
   const bool https = url.SchemeIs(chrome::kHttpsScheme);
   if (!(http || https)) {
     Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
     return false;
   }
   if (https && !prerender_manager_->config().https_allowed) {
     Destroy(FINAL_STATUS_HTTPS);
     return false;
   }
   if (prerender_manager_->HasRecentlyBeenNavigatedTo(url)) {
     Destroy(FINAL_STATUS_RECENTLY_VISITED);

[dominich, 2011/11/16 19:11:26]

What happens if we call Destroy here when adding the AliasURL?

[tburkard, 2011/11/16 19:21:31]

not running these checks anymore, adding directly, see chris's concern/my
response.

Done.

     return false;
   }
 
   alias_urls_.push_back(url);
   prerender_tracker_->AddPrerenderURLOnUIThread(url);
   return true;
 }
 
+void PrerenderContents::AddAliasURLsFromOtherPrerenderContents(
+    PrerenderContents* other_pc) {
+  for (std::vector<GURL>::const_iterator it = other_pc->alias_urls_.begin();
+       it != other_pc->alias_urls_.end();
+       ++it) {
+    AddAliasURL*it);

[dominich, 2011/11/16 19:11:26]

CHECK the return value here - it would be awful if this failed.

[tburkard, 2011/11/16 19:21:31]

not running these checks anymore, adding directly, see chris's concern/my
response.
On 2011/11/16 19:11:26, dominich wrote:

+  }
+}
+
 bool PrerenderContents::MatchesURL(const GURL& url, GURL* matching_url) const {
   std::vector<GURL>::const_iterator matching_url_iterator =
       std::find_if(alias_urls_.begin(),
                    alias_urls_.end(),
                    PrerenderURLPredicate(url));
   if (matching_url_iterator != alias_urls_.end()) {
     if (matching_url)
       *matching_url = *matching_url_iterator;
     return true;
   }
@@ skipping 148 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->tab_contents())
     return false;
   const TabContents* tab_contents = prerender_contents_->tab_contents();
   return (tab_contents->GetSiteInstance() !=
           tab_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender