Enable new-virtual-keyboard-behavior flag by default.

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 <utility>
 
 #include "ash/public/cpp/config.h"
@@ skipping 85 matching lines @@
   int call_count_;
   bool is_fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellObserver);
 };
 
 display::Display GetDisplayNearestWindow(aura::Window* window) {
   return display::Screen::GetScreen()->GetDisplayNearestWindow(window);
 }
 
+void DisableNewVKMode() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch(::switches::kDisableNewVirtualKeyboardBehavior))

[oshima, 2017/05/16 12:31:30]

you can just add it

[yhanada, 2017/05/17 01:33:37]

Done.

+    command_line->AppendSwitch(::switches::kDisableNewVirtualKeyboardBehavior);
+}
+
 }  // namespace
 
 using WorkspaceLayoutManagerTest = test::AshTestBase;
 
 // Verifies that a window containing a restore coordinate will be restored to
 // to the size prior to minimize, keeping the restore rectangle in tact (if
 // there is one).
 TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
   // See comment at top of file for why this is needed.
   WmWindowTestApi::GlobalMinimumSizeLock min_size_lock;
@@ skipping 1033 matching lines @@
 
   // Initializes the keyboard bounds using the bottom half of the work area.
   void InitKeyboardBounds() {
     gfx::Rect work_area(
         display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
     keyboard_bounds_.SetRect(work_area.x(),
                              work_area.y() + work_area.height() / 2,
                              work_area.width(), work_area.height() / 2);
   }
 
-  void EnableNewVKMode() {
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(::switches::kUseNewVirtualKeyboardBehavior))
-      command_line->AppendSwitch(::switches::kUseNewVirtualKeyboardBehavior);
-  }
-
   const gfx::Rect& keyboard_bounds() const { return keyboard_bounds_; }
 
  private:
   gfx::Insets restore_work_area_insets_;
   gfx::Rect keyboard_bounds_;
   WorkspaceLayoutManager* layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerKeyboardTest);
 };
 
 // Tests that when a child window gains focus the top level window containing it
 // is resized to fit the remaining workspace area.
 TEST_F(WorkspaceLayoutManagerKeyboardTest, ChildWindowFocused) {
+  // Append the flag to cause work area change in non-sticky mode.
+  DisableNewVKMode();
+
   // See comment at top of file for why this is needed.
   WmWindowTestApi::GlobalMinimumSizeLock min_size_lock;
 
   InitKeyboardBounds();
 
   gfx::Rect work_area(
       display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 
   std::unique_ptr<aura::Window> parent_window(
       CreateToplevelTestWindow(work_area));
@@ skipping 12 matching lines @@
             parent_window->bounds().ToString());
   ShowKeyboard();
   EXPECT_EQ(gfx::Rect(50, 0, 100, available_height).ToString(),
             parent_window->bounds().ToString());
   HideKeyboard();
   EXPECT_EQ(initial_window_bounds.ToString(),
             parent_window->bounds().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerKeyboardTest, AdjustWindowForA11yKeyboard) {
+  // Append the flag to cause work area change in non-sticky mode.
+  DisableNewVKMode();
+
   // See comment at top of file for why this is needed.
   WmWindowTestApi::GlobalMinimumSizeLock min_size_lock;
   InitKeyboardBounds();
   gfx::Rect work_area(
       display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 
   std::unique_ptr<aura::Window> window(CreateToplevelTestWindow(work_area));
   // The additional SetBounds() is needed as the aura-mus case uses Widget,
   // which alters the supplied bounds.
   window->SetBounds(work_area);
@@ skipping 32 matching lines @@
   EXPECT_EQ(
       gfx::Rect(50, keyboard_bounds().y() - keyboard_bounds().height() / 2,
                 occluded_window_bounds.width(), occluded_window_bounds.height())
           .ToString(),
       window->bounds().ToString());
   HideKeyboard();
   EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerKeyboardTest, IgnoreKeyboardBoundsChange) {
+  // Append the flag to cause work area change in non-sticky mode.
+  DisableNewVKMode();
   InitKeyboardBounds();
 
   std::unique_ptr<aura::Window> window(CreateTestWindow(keyboard_bounds()));
   // The additional SetBounds() is needed as the aura-mus case uses Widget,
   // which alters the supplied bounds.
   window->SetBounds(keyboard_bounds());
   wm::GetWindowState(window.get())->set_ignore_keyboard_bounds_change(true);
   wm::ActivateWindow(window.get());
 
   EXPECT_EQ(keyboard_bounds(), window->bounds());
   ShowKeyboard();
   EXPECT_EQ(keyboard_bounds(), window->bounds());
 }
 
 }  // namespace ash