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

ash/shelf/shelf_layout_manager_unittest.cc

Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index d8110b3559b77362f0d73a9382d5f5a4923e18b9..fc7cad95e8e86a9bf191c5ce37442f3a3128d507 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -1815,10 +1815,13 @@ class ShelfLayoutManagerKeyboardTest : public test::AshTestBase {
                              work_area.width(), work_area.height() / 2);
   }
 
-  void EnableNewVKMode() {
+  void DisableNewVKMode() {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(::switches::kUseNewVirtualKeyboardBehavior))
-      command_line->AppendSwitch(::switches::kUseNewVirtualKeyboardBehavior);
+    if (!command_line->HasSwitch(
+            ::switches::kDisableNewVirtualKeyboardBehavior)) {
+      command_line->AppendSwitch(
+          ::switches::kDisableNewVirtualKeyboardBehavior);
+    }
   }
 
   const gfx::Rect& keyboard_bounds() const { return keyboard_bounds_; }
@@ -1830,6 +1833,9 @@ class ShelfLayoutManagerKeyboardTest : public test::AshTestBase {
 };
 
 TEST_F(ShelfLayoutManagerKeyboardTest, ShelfChangeWorkAreaInNonStickyMode) {
+  // Append the flag to cause work area change in non-sticky mode.
+  DisableNewVKMode();

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

you can just add a flag here.

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

Done.

+
   ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
   keyboard::SetAccessibilityKeyboardEnabled(true);
   InitKeyboardBounds();
@@ -1866,9 +1872,6 @@ TEST_F(ShelfLayoutManagerKeyboardTest, ShelfChangeWorkAreaInNonStickyMode) {
 // keyboard work area in non-sticky mode.
 TEST_F(ShelfLayoutManagerKeyboardTest,
        ShelfIgnoreWorkAreaChangeInNonStickyMode) {
-  // Append flag to ignore work area change in non-sticky mode.
-  EnableNewVKMode();
-
   ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
   InitKeyboardBounds();
   Shell::Get()->CreateKeyboard();