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

ui/views/controls/tree/tree_view_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 "ui/views/controls/tree/tree_view_win.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 673 matching lines @@
     ImageList_AddIcon(image_list, h_opened_icon);
     DestroyIcon(h_closed_icon);
     DestroyIcon(h_opened_icon);
     for (size_t i = 0; i < model_images.size(); ++i) {
       HICON model_icon;
 
       // Need to resize the provided icons to be the same size as
       // IDR_FOLDER_CLOSED if they aren't already.
       if (model_images[i].width() != width ||
           model_images[i].height() != height) {
-        gfx::Canvas canvas(gfx::Size(width, height), ui::SCALE_FACTOR_100P,
-            false);
+        gfx::Canvas canvas(gfx::Size(width, height), false);
 
         // Draw our icons into this canvas.
         int height_offset = (height - model_images[i].height()) / 2;
         int width_offset = (width - model_images[i].width()) / 2;
         canvas.DrawImageInt(model_images[i], width_offset, height_offset);
-        model_icon = IconUtil::CreateHICONFromSkBitmap(
-            canvas.ExtractImageRep().sk_bitmap());
+        model_icon = IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap());
       } else {
         model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]);
       }
       ImageList_AddIcon(image_list, model_icon);
       DestroyIcon(model_icon);
     }
   }
   return image_list;
 }
 
@@ skipping 82 matching lines @@
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views