Snap widgets to pixel boundary on ash

ash/wm/workspace/workspace_layout_manager_unittest.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 "ash/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
 
 #include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
@@ skipping 505 matching lines @@
   window_state2->OnWMEvent(&toggle_fullscreen_event);
   EXPECT_EQ(5, observer.call_count());
   EXPECT_TRUE(observer.is_fullscreen());
 
   // Closing the window should change the fullscreen state.
   window2.reset();
   EXPECT_EQ(6, observer.call_count());
   EXPECT_FALSE(observer.is_fullscreen());
 }
 
-// Following tests were originally written for BaseLayoutManager.
-
+// Following "Solo" tests were originally written for BaseLayoutManager.
 namespace {
 
 class WorkspaceLayoutManagerSoloTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerSoloTest() {}
   virtual ~WorkspaceLayoutManagerSoloTest() {}
 
-  virtual void SetUp() OVERRIDE {
-    test::AshTestBase::SetUp();
-    UpdateDisplay("800x600");
-    aura::Window* default_container = Shell::GetContainer(
-        Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
-    default_container->SetLayoutManager(
-        new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow()));
-  }
-
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerSoloTest);
 };
 
 }  // namespace
 
@@ skipping 432 matching lines @@
 class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerKeyboardTest() {}
   virtual ~WorkspaceLayoutManagerKeyboardTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     UpdateDisplay("800x600");
     aura::Window* default_container = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
-    layout_manager_ = new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow());
-    default_container->SetLayoutManager(layout_manager_);
+    layout_manager_ = static_cast<WorkspaceLayoutManager*>(
+        default_container->layout_manager());
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
   void ShowKeyboard() {
     restore_work_area_insets_ = Shell::GetScreen()->GetPrimaryDisplay().
         GetWorkAreaInsets();
     Shell::GetInstance()->SetDisplayWorkAreaInsets(
@@ skipping 79 matching lines @@
   HideKeyboard();
   if (switches::IsTextInputFocusManagerEnabled()) {
     ui::TextInputFocusManager::GetInstance()->BlurTextInputClient(
         &text_input_client);
   } else {
     input_method->SetFocusedTextInputClient(NULL);
   }
 }
 
 }  // namespace ash