Remove page IDs from three WebContentsObserver APIs that don't need it.

chrome/browser/favicon/favicon_handler_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/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 419 matching lines @@
 
   void UpdateFaviconURL(
       TestFaviconHandler* favicon_handler,
       const GURL& page_url,
       const std::vector<FaviconURL>& candidate_icons) {
     favicon_handler->ResetNumFaviconUpdateNotifications();
 
     favicon_handler->FetchFavicon(page_url);
     favicon_handler->history_handler()->InvokeCallback();
 
-    favicon_handler->OnUpdateFaviconURL(0, candidate_icons);
+    favicon_handler->OnUpdateFaviconURL(candidate_icons);
   }
 
   virtual void SetUp() {
     // The score computed by SelectFaviconFrames() is dependent on the supported
     // scale factors of the platform. It is used for determining the goodness of
     // a downloaded bitmap in FaviconHandler::OnDidDownloadFavicon().
     // Force the values of the scale factors so that the tests produce the same
     // results on all platforms.
     std::vector<ui::ScaleFactor> scale_factors;
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
@@ skipping 40 matching lines @@
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
   EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon shouldn't request to download icon.
   EXPECT_FALSE(helper.download_handler()->HasDownload());
 }
@@ skipping 23 matching lines @@
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
   EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
@@ skipping 51 matching lines @@
   EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
@@ skipping 69 matching lines @@
   EXPECT_EQ(GURL(), helper.GetEntry()->GetFavicon().url);
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with matching favicon URL.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // A download for the favicon should be requested, and we should not do
   // another history request.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
   EXPECT_EQ(NULL, helper.history_handler());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
@@ skipping 43 matching lines @@
   EXPECT_EQ(icon_url, helper.GetEntry()->GetFavicon().url);
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
@@ skipping 46 matching lines @@
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(
       icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
             helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
@@ skipping 93 matching lines @@
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(
       icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(
       FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, urls);
+  helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
   ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
             helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
@@ skipping 13 matching lines @@
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   helper.set_history_handler(NULL);
   const GURL latest_icon_url("http://www.google.com/latest_favicon");
   std::vector<FaviconURL> latest_urls;
   latest_urls.push_back(FaviconURL(
       latest_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
-  helper.OnUpdateFaviconURL(0, latest_urls);
+  helper.OnUpdateFaviconURL(latest_urls);
 
   EXPECT_EQ(1U, helper.urls().size());
   EXPECT_EQ(latest_icon_url, helper.current_candidate()->icon_url);
   EXPECT_EQ(FaviconURL::TOUCH_ICON, helper.current_candidate()->icon_type);
 
   // Whether new icon is requested from history
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(latest_icon_url, history_handler->icon_url_);
   EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
@@ skipping 494 matching lines @@
   download_id = favicon_tab_helper->StartDownload(missing_icon_url, 0);
   EXPECT_NE(0, download_id);
   // Report download success with HTTP 200 status.
   favicon_tab_helper->DidDownloadFavicon(download_id, 200, missing_icon_url,
       empty_icons, empty_icon_sizes);
   // Icon is not marked as UnableToDownload as HTTP status is not 404.
   EXPECT_FALSE(favicon_service->WasUnableToDownloadFavicon(missing_icon_url));
 }
 
 }  // namespace.