Remove redundant |errored| member from IconHostMsg_DidDownloadFavicon

chrome/browser/ui/metro_pin_tab_helper_win.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 "chrome/browser/ui/metro_pin_tab_helper_win.h"
 
 #include <set>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 229 matching lines @@
 
   ~FaviconChooser() {}
 
   // Pin the page on the FILE thread using the current |best_candidate_| and
   // delete the FaviconChooser.
   void UseChosenCandidate();
 
   // Update the |best_candidate_| with the newly downloaded favicons provided.
   void UpdateCandidate(int id,
                        const GURL& image_url,
-                       bool errored,
                        int requested_size,
                        const std::vector<SkBitmap>& bitmaps);
 
   void AddPendingRequest(int request_id);
 
  private:
   // The tab helper that this chooser is operating for.
   MetroPinTabHelper* helper_;
 
   // Title and URL of the page being pinned.
@@ skipping 23 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   scoped_refptr<PinPageTaskRunner> runner(
       new PinPageTaskRunner(title_, url_, best_candidate_));
   runner->Run();
   helper_->FaviconDownloaderFinished();
 }
 
 void MetroPinTabHelper::FaviconChooser::UpdateCandidate(
     int id,
     const GURL& image_url,
-    bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   const int kMaxIconSize = 32;
 
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   std::set<int>::iterator iter = in_progress_requests_.find(id);
   // Check that this request is one of ours.
   if (iter == in_progress_requests_.end())
     return;
 
   in_progress_requests_.erase(iter);
 
   // Process the bitmaps, keeping the one that is best so far.
-   if (!errored) {
-    for (std::vector<SkBitmap>::const_iterator iter = bitmaps.begin();
-         iter != bitmaps.end();
-         ++iter) {
+  for (std::vector<SkBitmap>::const_iterator iter = bitmaps.begin();
+       iter != bitmaps.end();
+       ++iter) {
 
-      // If the new bitmap is too big, ignore it.
-      if (iter->height() > kMaxIconSize || iter->width() > kMaxIconSize)
-        continue;
+    // If the new bitmap is too big, ignore it.
+    if (iter->height() > kMaxIconSize || iter->width() > kMaxIconSize)
+      continue;
 
-      // If we don't have a best candidate yet, this is better so just grab it.
-      if (best_candidate_.isNull()) {
-        best_candidate_ = *gfx::ImageSkia(*iter).DeepCopy().get();
-        continue;
-      }
+    // If we don't have a best candidate yet, this is better so just grab it.
+    if (best_candidate_.isNull()) {
+      best_candidate_ = *gfx::ImageSkia(*iter).DeepCopy().get();
+      continue;
+    }
 
-      // If it is smaller than our best one so far, ignore it.
-      if (iter->height() <= best_candidate_.height() ||
-          iter->width() <= best_candidate_.width()) {
-        continue;
-      }
+    // If it is smaller than our best one so far, ignore it.
+    if (iter->height() <= best_candidate_.height() ||
+        iter->width() <= best_candidate_.width()) {
+      continue;
+    }
 
-      // Othewise it is our new best candidate.
-      best_candidate_ = *gfx::ImageSkia(*iter).DeepCopy().get();
-    }
+    // Othewise it is our new best candidate.
+    best_candidate_ = *gfx::ImageSkia(*iter).DeepCopy().get();
   }
 
   // If there are no more outstanding requests, pin the page on the FILE thread.
   // Once this happens this downloader has done its job, so delete it.
   if (in_progress_requests_.empty())
     UseChosenCandidate();
 }
 
 void MetroPinTabHelper::FaviconChooser::AddPendingRequest(int request_id) {
   in_progress_requests_.insert(request_id);
@@ skipping 80 matching lines @@
 
 void MetroPinTabHelper::DidUpdateFaviconURL(
     int32 page_id,
     const std::vector<content::FaviconURL>& candidates) {
   favicon_url_candidates_ = candidates;
 }
 
 void MetroPinTabHelper::DidDownloadFavicon(
     int id,
     const GURL& image_url,
-    bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   if (favicon_chooser_.get()) {
-    favicon_chooser_->UpdateCandidate(id, image_url, errored,
-                                      requested_size, bitmaps);
+    favicon_chooser_->UpdateCandidate(id, image_url, requested_size, bitmaps);
   }
 }
 
 void MetroPinTabHelper::UnPinPageFromStartScreen() {
   HMODULE metro_module = base::win::GetMetroModule();
   if (!metro_module)
     return;
 
   base::win::MetroUnPinFromStartScreen metro_un_pin_from_start_screen =
       reinterpret_cast<base::win::MetroUnPinFromStartScreen>(
           ::GetProcAddress(metro_module, "MetroUnPinFromStartScreen"));
   if (!metro_un_pin_from_start_screen) {
     NOTREACHED();
     return;
   }
 
   GURL url = web_contents()->GetURL();
   string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
   metro_un_pin_from_start_screen(tile_id,
                                  base::Bind(&PinPageReportUmaCallback));
 }
 
 void MetroPinTabHelper::FaviconDownloaderFinished() {
   favicon_chooser_.reset();
 }