Modify a favicon DCHECK.

chrome/browser/favicon/favicon_service.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/favicon/favicon_service.h"
 
 #include <cmath>
 
 #include "base/hash.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 385 matching lines @@
 void FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults(
     const favicon_base::FaviconRawBitmapCallback& callback,
     int desired_size_in_pixel,
     const std::vector<favicon_base::FaviconRawBitmapResult>&
         favicon_bitmap_results) {
   if (favicon_bitmap_results.empty() || !favicon_bitmap_results[0].is_valid()) {
     callback.Run(favicon_base::FaviconRawBitmapResult());
     return;
   }
 
-  DCHECK_EQ(1u, favicon_bitmap_results.size());
+  DCHECK_LE(1u, favicon_bitmap_results.size());

[stevenjb, 2014/07/25 18:45:19]

We early exit above if favicon_bitmap_results.empty(), so this is effectively
the same test.

[stevenjb, 2014/07/25 18:47:31]

I *think* (it's been a long time) was that the expectation was that at this
point there would only be one valid result? That may have changed, so maybe a GE
test would be correct here?
+sky@

[Daniel Nishi, 2014/07/25 21:13:37]

Yeah, you're right. I've changed it back to the removed version.

   favicon_base::FaviconRawBitmapResult bitmap_result =
       favicon_bitmap_results[0];
 
   // If the desired size is 0, SelectFaviconFrames() will return the largest
   // bitmap without doing any resizing. As |favicon_bitmap_results| has bitmap
   // data for a single bitmap, return it and avoid an unnecessary decode.
   if (desired_size_in_pixel == 0) {
     callback.Run(bitmap_result);
     return;
   }
@@ skipping 16 matching lines @@
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false,
                                          &resized_bitmap_data)) {
     callback.Run(favicon_base::FaviconRawBitmapResult());
     return;
   }
 
   bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector(
       &resized_bitmap_data);
   callback.Run(bitmap_result);
 }