Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/chromeos/status/network_menu_icon.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/chromeos/status/network_menu_icon.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <utility>
@@ skipping 215 matching lines @@
     if (bottom_left_badge_) {
       canvas.DrawImageInt(*bottom_left_badge_,
                           kBadgeLeftX,
                           icon_.height() - bottom_left_badge_->height());
     }
     if (bottom_right_badge_) {
       canvas.DrawImageInt(*bottom_right_badge_,
                           icon_.width() - bottom_right_badge_->width(),
                           icon_.height() - bottom_right_badge_->height());
     }
-    return canvas.ExtractImageRep();
+    return gfx::ImageSkiaRep(canvas.ExtractBitmap(), icon_rep.scale_factor());
   }
 
  private:
   const gfx::ImageSkia icon_;
   const gfx::ImageSkia *top_left_badge_;
   const gfx::ImageSkia *top_right_badge_;
   const gfx::ImageSkia *bottom_left_badge_;
   const gfx::ImageSkia *bottom_right_badge_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkIconImageSource);
@@ skipping 690 matching lines @@
 const gfx::ImageSkia NetworkMenuIcon::GetConnectedImage(ImageType type,
       ResourceColorTheme color) {
   return GetImage(type, NumImages(type) - 1, color);
 }
 
 int NetworkMenuIcon::NumImages(ImageType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
 }  // chromeos