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

chrome/browser/ui/webui/ntp/ntp_login_handler.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/ui/webui/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 42 matching lines @@
 
 namespace {
 
 SkBitmap GetGAIAPictureForNTP(const gfx::Image& image) {
   // This value must match the width and height value of login-status-icon
   // in new_tab.css.
   const int kLength = 27;
   SkBitmap bmp = skia::ImageOperations::Resize(*image.ToSkBitmap(),
       skia::ImageOperations::RESIZE_BEST, kLength, kLength);
 
-  gfx::Canvas canvas(gfx::Size(kLength, kLength), ui::SCALE_FACTOR_100P,
-      false);
+  gfx::Canvas canvas(gfx::Size(kLength, kLength), false);
   canvas.DrawImageInt(bmp, 0, 0);
 
   // Draw a gray border on the inside of the icon.
   SkColor color = SkColorSetARGB(83, 0, 0, 0);
   canvas.DrawRect(gfx::Rect(0, 0, kLength - 1, kLength - 1), color);
 
-  return canvas.ExtractImageRep().sk_bitmap();
+  return canvas.ExtractBitmap();
 }
 
 // Puts the |content| into a span with the given CSS class.
 string16 CreateSpanWithClass(const string16& content,
                              const std::string& css_class) {
   return ASCIIToUTF16("<span class='" + css_class + "'>") +
       net::EscapeForHTML(content) + ASCIIToUTF16("</span>");
 }
 
 } // namespace
@@ skipping 191 matching lines @@
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }