Ignore favicon request in DataSaverWithServerBrowserTest.ReloadPage

chrome/browser/data_saver/data_saver_browsertest.cc

 // Copyright 2015 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 <string>
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 49 matching lines @@
   }
   void EnableDataSaver(bool enabled) {
     PrefService* prefs = browser()->profile()->GetPrefs();
     prefs->SetBoolean(prefs::kDataSaverEnabled, enabled);
   }
 
   std::unique_ptr<net::test_server::HttpResponse> VerifySaveDataHeader(
       const net::test_server::HttpRequest& request) {
     auto save_data_header_it = request.headers.find("save-data");
 
+    if (request.relative_url == "/favicon.ico") {
+      // Favicon request could be received for the previous page load.
+      return std::unique_ptr<net::test_server::HttpResponse>();
+    }
+
     if (!expected_save_data_header_.empty()) {
-      EXPECT_TRUE(save_data_header_it != request.headers.end());
-      EXPECT_EQ(expected_save_data_header_, save_data_header_it->second);
+      EXPECT_TRUE(save_data_header_it != request.headers.end())
+          << request.relative_url;
+      EXPECT_EQ(expected_save_data_header_, save_data_header_it->second)
+          << request.relative_url;
     } else {
-      EXPECT_TRUE(save_data_header_it == request.headers.end());
+      EXPECT_TRUE(save_data_header_it == request.headers.end())
+          << request.relative_url;
     }
     return std::unique_ptr<net::test_server::HttpResponse>();
   }
 
   std::unique_ptr<net::EmbeddedTestServer> test_server_;
   std::string expected_save_data_header_;
 };
 
 IN_PROC_BROWSER_TEST_F(DataSaverWithServerBrowserTest, ReloadPage) {
   Init();
@@ skipping 12 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents());
 
   // Reload the webpage with data saver disabled, and expect all the resources
   // will get no save-data header.
   EnableDataSaver(false);
   expected_save_data_header_ = "";
   chrome::Reload(browser(), CURRENT_TAB);
   content::WaitForLoadStop(
       browser()->tab_strip_model()->GetActiveWebContents());
 }