Move extension/app default icon into src/extensions

extensions/browser/extension_icon_image.cc

 // Copyright 2014 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 "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 192 matching lines @@
 void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
   const gfx::ImageSkia* image =
       image_in.IsEmpty() ? &default_icon_ : image_in.ToImageSkia();
 
   // Maybe default icon was not set.
   if (image->isNull())
     return;
 
   gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
   DCHECK(!rep.is_null());
-#if !defined(USE_ATHENA)
-  // TODO(oshima): It someshow gets 2x image for 1x for some extensions. Fix
-  // this.
   DCHECK_EQ(scale, rep.scale());
-#endif
 
   // Remove old representation if there is one.
   image_skia_.RemoveRepresentation(scale);
   image_skia_.AddRepresentation(rep);
 
   if (observer_)
     observer_->OnExtensionIconImageChanged(this);
 }
 
 void IconImage::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions