Remove screen dependency from font_render_params_linux

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display_observer.h"
+#include "ui/gfx/font_render_params.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
 // Class which allows for the designation of non-client component targets of
 // hit tests.
 class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
@@ skipping 47 matching lines @@
   }
 
  protected:
   std::vector<gfx::Display> changed_display_;
   std::vector<gfx::Display> added_display_;
   std::vector<gfx::Display> removed_display_;
 
   DesktopScreenX11* screen() { return screen_.get(); }
 
   void NotifyDisplaysChanged(const std::vector<gfx::Display>& displays) {
-    DesktopScreenX11* screen = screen_.get();
-    screen->change_notifier_.NotifyDisplaysChanged(screen->displays_, displays);
-    screen->displays_ = displays;
+    std::vector<gfx::Display> old_displays = screen_->displays_;
+    screen_->SetDisplaysInternal(displays);
+    screen_->change_notifier_.NotifyDisplaysChanged(old_displays,
+                                                    screen_->displays_);
   }
 
   void ResetDisplayChanges() {
     changed_display_.clear();
     added_display_.clear();
     removed_display_.clear();
   }
 
   Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds,
       bool use_test_native_widget) {
@@ skipping 333 matching lines @@
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(
       gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
   NotifyDisplaysChanged(displays);
   ResetDisplayChanges();
 
   displays[0].set_device_scale_factor(2.5f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(1u, changed_display_.size());
+  EXPECT_EQ(2.5f, gfx::GetFontRenderParamsDeviceScaleFactor());
 
   displays[1].set_device_scale_factor(2.5f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_device_scale_factor(2.5f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[1].set_device_scale_factor(2.5f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_device_scale_factor(1.f);
   displays[1].set_device_scale_factor(1.f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(4u, changed_display_.size());
+  EXPECT_EQ(1.f, gfx::GetFontRenderParamsDeviceScaleFactor());
 }
 
 }  // namespace views