Turns on smart deployment of the virtual keyboard by default, and changes the flag to allow easy di…

ash/system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc

 // Copyright 2014 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/system/chromeos/virtual_keyboard/tray_keyboard_lock.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/virtual_keyboard_test_helper.h"
 #include "base/command_line.h"
-#include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 class TrayKeyboardLockTest : public test::AshTestBase {
  public:
   TrayKeyboardLockTest() {}
   virtual ~TrayKeyboardLockTest() {}
 
   TrayKeyboardLock* tray() { return tray_.get(); }
@@ skipping 44 matching lines @@
       notification);
 }
 
 void TrayKeyboardLockTest::TearDownViews() {
   tray_view_.reset();
   default_view_.reset();
   tray_.reset();
 }
 
 void TrayKeyboardLockTest::SetUp() {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      keyboard::switches::kAutoVirtualKeyboard);
   test::AshTestBase::SetUp();
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
 }
 
 void TrayKeyboardLockTest::TearDown() {
   SetAccessibilityKeyboardEnabled(false);
   TearDownViews();
   test::AshTestBase::TearDown();
 }
 
@@ skipping 33 matching lines @@
 
   tap = ui::GestureEvent(
       0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   default_view()->OnGestureEvent(&tap);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(tray_view()->visible());
   EXPECT_TRUE(default_view()->visible());
 }
 
 }  // namespace ash