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

ash/shell/app_list.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 <string>
 
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_delegate.h"
@@ skipping 185 matching lines @@
 
       std::string title = WindowTypeLauncherItem::GetTitle(type);
       apps->Add(new WindowTypeLauncherItem(type));
     }
   }
 
   gfx::ImageSkia CreateSearchBoxIcon() {
     const string16 icon_text = ASCIIToUTF16("ash");
     const gfx::Size icon_size(32, 32);
 
-    gfx::Canvas canvas(icon_size, ui::SCALE_FACTOR_100P,
-                       false /* is_opaque */);
+    gfx::Canvas canvas(icon_size, false /* is_opaque */);
     canvas.DrawStringInt(icon_text,
                          gfx::Font(),
                          SK_ColorBLACK,
                          0, 0, icon_size.width(), icon_size.height(),
                          gfx::Canvas::TEXT_ALIGN_CENTER |
                              gfx::Canvas::TEXT_VALIGN_MIDDLE |
                              gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
-    return gfx::ImageSkia(canvas.ExtractImageRep());
+    return gfx::ImageSkia(canvas.ExtractImageSkiaRep());
   }
 
   void DecorateSearchBox(app_list::SearchBoxModel* search_box_model) {
     search_box_model->SetIcon(CreateSearchBoxIcon());
     search_box_model->SetHintText(ASCIIToUTF16("Type to search..."));
   }
 
   // Overridden from ash::AppListViewDelegate:
   virtual void SetModel(app_list::AppListModel* model) OVERRIDE {
     model_ = model;
@@ skipping 50 matching lines @@
 };
 
 }  // namespace
 
 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 }  // namespace shell
 }  // namespace ash