Allow storing display preferences per device.

ash/wm/workspace/workspace_window_resizer_unittest.cc

Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 393f707111079a26215a9dedacf15897095576ea..e3edf8cdcdcd98c96db397beec96ffef4e93815a 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -662,40 +662,40 @@ TEST_F(WorkspaceWindowResizerTest, WarpMousePointer) {
   ASSERT_TRUE(controller);
   window_->SetBounds(gfx::Rect(0, 0, 50, 60));
 
-  EXPECT_FALSE(controller->dont_warp_mouse_);
+  EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
   {
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
     // While dragging a window, warp should be allowed.
-    EXPECT_FALSE(controller->dont_warp_mouse_);
+    EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
     resizer->CompleteDrag(0);
   }
-  EXPECT_FALSE(controller->dont_warp_mouse_);
+  EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
 
   {
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
-    EXPECT_FALSE(controller->dont_warp_mouse_);
+    EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
     resizer->RevertDrag();
   }
-  EXPECT_FALSE(controller->dont_warp_mouse_);
+  EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
 
   {
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTRIGHT, empty_windows()));
     // While resizing a window, warp should NOT be allowed.
-    EXPECT_TRUE(controller->dont_warp_mouse_);
+    EXPECT_TRUE(controller->dont_warp_mouse_for_testing());
     resizer->CompleteDrag(0);
   }
-  EXPECT_FALSE(controller->dont_warp_mouse_);
+  EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
 
   {
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTRIGHT, empty_windows()));
-    EXPECT_TRUE(controller->dont_warp_mouse_);
+    EXPECT_TRUE(controller->dont_warp_mouse_for_testing());
     resizer->RevertDrag();
   }
-  EXPECT_FALSE(controller->dont_warp_mouse_);
+  EXPECT_FALSE(controller->dont_warp_mouse_for_testing());
 }
 
 // Verifies windows are correctly restacked when reordering multiple windows.