predictors: Fix duplicate content type detection.

chrome/browser/predictors/resource_prefetcher_unittest.cc

 // Copyright 2014 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/predictors/resource_prefetcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 171 matching lines @@
       "http://m.google.com/resource2.html")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://m.google.com/resource3.css")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://m.google.com/resource4.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://yahoo.com/resource4.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://yahoo.com/resource5.png")));
 
-  NavigationID navigation_id;
-  navigation_id.render_process_id = 1;
-  navigation_id.render_frame_id = 2;
-  navigation_id.main_frame_url = GURL("http://www.google.com");
+  NavigationID navigation_id(1, 2, GURL("http://www.google.com"));
 
   // Needed later for comparison.
   ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
 
   prefetcher_.reset(
       new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
                                  PREFETCH_KEY_TYPE_URL, std::move(requests)));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
@@ skipping 97 matching lines @@
       "http://www.google.com/resource2.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://yahoo.com/resource1.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://yahoo.com/resource2.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://yahoo.com/resource3.png")));
   requests->push_back(new ResourcePrefetcher::Request(GURL(
       "http://m.google.com/resource1.jpg")));
 
-  NavigationID navigation_id;
-  navigation_id.render_process_id = 1;
-  navigation_id.render_frame_id = 2;
-  navigation_id.main_frame_url = GURL("http://www.google.com");
+  NavigationID navigation_id(1, 2, GURL("http://www.google.com"));
 
   // Needed later for comparison.
   ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
 
   prefetcher_.reset(
       new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
                                  PREFETCH_KEY_TYPE_HOST, std::move(requests)));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
@@ skipping 30 matching lines @@
   // We need to delete requests_ptr here, though it looks to be managed by the
   // scoped_ptr requests. The scoped_ptr requests releases itself and the raw
   // pointer requests_ptr is passed to ResourcePrefetcherFinished(). In the
   // test, ResourcePrefetcherFinished() is a mock function and does not handle
   // the raw pointer properly. In the real code, requests_ptr will eventually be
   // passed to and managed by ResourcePrefetchPredictor::Result::Result.
   delete requests_ptr;
 }
 
 }  // namespace predictors