Merge 22254 - LocationBarView::PageActionImageView::LoadImageTask::Run() may ...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2009 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/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1135 matching lines @@
                // get deleted until we get a response from image loading (see
                // ImageLoadingDone).
   }
   ~ImageLoadingTracker() {}
 
   void StopTrackingImageLoad() {
     view_ = NULL;
   }
 
   void OnImageLoaded(SkBitmap* image, int index) {
-    if (image == NULL)
+    if (image == NULL) {
+      NOTREACHED();
       image = new SkBitmap();
+    }
     if (view_)
       view_->OnImageLoaded(image, index);
     delete image;
     if (--image_count_ == 0)
       Release();  // We are no longer needed.
   }
 
  private:
 
   // The view that is waiting for the image to load.
@@ skipping 204 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_image_views_.size(); i++) {
     if (page_action_image_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }