Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

 // Copyright 2013 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/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
@@ skipping 66 matching lines @@
   }
 
   virtual bool ShouldShowAvatar() const OVERRIDE {
     return show_avatar_;
   }
 
   virtual gfx::ImageSkia GetOTRAvatarIcon() const OVERRIDE {
     // The calculations depend on the size of the OTR resource, and chromeos
     // uses a different sized image, so hard code the size of the current
     // windows/linux one.
-    gfx::ImageSkiaRep rep(gfx::Size(40, 29), ui::SCALE_FACTOR_100P);
+    gfx::ImageSkiaRep rep(gfx::Size(40, 29), 1.0f);
     gfx::ImageSkia image(rep);
     return image;
   }
 
   virtual bool IsMaximized() const OVERRIDE {
     return window_state_ == STATE_MAXIMIZED;
   }
 
   virtual bool IsMinimized() const OVERRIDE {
     return window_state_ == STATE_MINIMIZED;
@@ skipping 68 matching lines @@
   virtual void TearDown() OVERRIDE {
     widget_->CloseNow();
 
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   views::ImageButton* InitWindowCaptionButton(ViewID view_id,
                                               const gfx::Size& size) {
     views::ImageButton* button = new views::ImageButton(NULL);
-    gfx::ImageSkiaRep rep(size, ui::SCALE_FACTOR_100P);
+    gfx::ImageSkiaRep rep(size, 1.0f);
     gfx::ImageSkia image(rep);
     button->SetImage(views::CustomButton::STATE_NORMAL, &image);
     button->set_id(view_id);
     root_view_->AddChildView(button);
     return button;
   }
 
   void AddWindowTitleIcons() {
     tab_icon_view_ = new TabIconView(NULL);
     tab_icon_view_->set_is_light(true);
@@ skipping 109 matching lines @@
 
   ExpectBasicWindowBounds();
 
   // Check the location of the avatar
   EXPECT_EQ("7,11 40x29", menu_button_->bounds().ToString());
   EXPECT_EQ("45,13 352x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 }