predictors: Ignore repeating subresources while checking.

chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc

 // Copyright 2016 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 "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_test_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 43 matching lines @@
   void OnPredictorInitialized() override { run_loop_.Quit(); }
 
   void Wait() { run_loop_.Run(); }
 
  private:
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(InitializationObserver);
 };
 
+using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
+using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
+
+std::vector<URLRequestSummary> GetUniqueSubresources(
+    const PageRequestSummary& summary) {
+  std::vector<URLRequestSummary> subresources(

[Benoit L, 2016/11/28 14:58:04]

nit: why not just a copy?

[alexilin, 2016/11/28 15:12:15]

Done.

+      summary.subresource_requests.begin(), summary.subresource_requests.end());
+  std::sort(subresources.begin(), subresources.end(),

[Benoit L, 2016/11/28 14:58:04]

Do you need stable_sort here?

[alexilin, 2016/11/28 15:12:15]

Thanks! Indeed we need first occurrences of each subresource.
Done.

+            [](const URLRequestSummary& x, const URLRequestSummary& y) {
+              return x.resource_url < y.resource_url;
+            });
+  subresources.erase(
+      std::unique(subresources.begin(), subresources.end(),
+                  [](const URLRequestSummary& x, const URLRequestSummary& y) {
+                    return x.resource_url == y.resource_url;
+                  }),
+      subresources.end());
+  return subresources;
+}
+
 // Helper class to track and allow waiting for ResourcePrefetchPredictor events.
 // These events are also used to verify that ResourcePrefetchPredictor works as
 // expected.
 class ResourcePrefetchPredictorTestObserver : public TestObserver {
  public:
-  using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
 
   explicit ResourcePrefetchPredictorTestObserver(
       ResourcePrefetchPredictor* predictor,
       const size_t expected_url_visit_count,
       const PageRequestSummary& expected_summary)
       : TestObserver(predictor),
         url_visit_count_(expected_url_visit_count),
         summary_(expected_summary) {}
 
   // TestObserver:
   void OnNavigationLearned(size_t url_visit_count,
                            const PageRequestSummary& summary) override {
     EXPECT_EQ(url_visit_count, url_visit_count_);
     EXPECT_EQ(summary.main_frame_url, summary_.main_frame_url);
     EXPECT_EQ(summary.initial_url, summary_.initial_url);
     EXPECT_THAT(

[Benoit L, 2016/11/28 14:58:04]

Can you add a comment to explain that we have duplicate resources, and that only
care about the (first?) occurrence of each?

[alexilin, 2016/11/28 15:12:15]

Done.

-        summary.subresource_requests,
+        GetUniqueSubresources(summary),
         testing::UnorderedElementsAreArray(summary_.subresource_requests));
     run_loop_.Quit();
   }
 
   void Wait() { run_loop_.Run(); }
 
  private:
   base::RunLoop run_loop_;
   size_t url_visit_count_;
   PageRequestSummary summary_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictorTestObserver);
 };
 
 class ResourcePrefetchPredictorBrowserTest : public InProcessBrowserTest {
  protected:
-  using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(
         switches::kSpeculativeResourcePrefetching,
         switches::kSpeculativeResourcePrefetchingEnabled);
   }
 
   void SetUpOnMainThread() override {
     embedded_test_server()->RegisterRequestHandler(base::Bind(
         &ResourcePrefetchPredictorBrowserTest::HandleRedirectRequest,
@@ skipping 226 matching lines @@
   AddResource(https_server()->GetURL(kStylePath),
               content::RESOURCE_TYPE_STYLESHEET, net::HIGHEST);
   AddResource(https_server()->GetURL(kScriptPath),
               content::RESOURCE_TYPE_SCRIPT, net::MEDIUM);
   AddResource(https_server()->GetURL(kFontPath),
               content::RESOURCE_TYPE_FONT_RESOURCE, net::HIGHEST);
   NavigateToURLAndCheckSubresources(GetURL(kRedirectPath));
 }
 
 }  // namespace predictors