Put OOBE UI on touch display if no keyboard detected

chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

Index: chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6457fa7dbed44bbeca0fbeddf617c0772a0afa00
--- /dev/null
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc
@@ -0,0 +1,108 @@
+// Copyright 2017 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 "chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h"
+
+#include "ash/display/display_configuration_controller.h"
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/display.h"
+#include "ui/display/display_observer.h"
+#include "ui/display/manager/display_manager.h"
+#include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
+
+namespace chromeos {
+
+class OobeDisplayChooserTest : public ash::test::AshTestBase {

[jdufault, 2017/05/08 17:44:58]

Put test fixture in anonymous namespace.

+ protected:

[jdufault, 2017/05/08 17:44:58]

protected => public/private, add DISALLOW_COPY_AND_ASSIGN

+  void SetUp() override {
+    ash::test::AshTestBase::SetUp();
+    display_manager_test_api_.reset(
+        new display::test::DisplayManagerTestApi(display_manager()));
+  }
+
+  void TearDown() override { ash::test::AshTestBase::TearDown(); }

[jdufault, 2017/05/08 17:44:58]

Remove?

+
+  void EnableTouch(int64_t id) {
+    display_manager_test_api_->SetTouchSupport(
+        id, display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE);
+  }
+
+  void DisableTouch(int64_t id) {
+    display_manager_test_api_->SetTouchSupport(
+        id, display::Display::TouchSupport::TOUCH_SUPPORT_UNAVAILABLE);
+  }
+
+  int64_t GetPrimaryDisplay() {
+    return display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  }
+
+  std::unique_ptr<display::test::DisplayManagerTestApi>
+      display_manager_test_api_;
+};
+
+TEST_F(OobeDisplayChooserTest, PreferTouchAsPrimary) {
+  std::unique_ptr<OobeDisplayChooser> display_chooser(
+      OobeDisplayChooser::CreateDefault());
+
+  UpdateDisplay("3000x2000,800x600");
+  auto ids = display_manager()->GetCurrentDisplayIdList();
+  DisableTouch(ids[0]);
+  EnableTouch(ids[1]);
+
+  EXPECT_EQ(ids[0], GetPrimaryDisplay());
+  display_chooser->TryToPlaceUIOnTouchDisplay();
+
+  EXPECT_EQ(ids[1], GetPrimaryDisplay());
+}
+
+TEST_F(OobeDisplayChooserTest, AddingSecondTouchDisplayShouldbeNOP) {
+  std::unique_ptr<OobeDisplayChooser> display_chooser(
+      OobeDisplayChooser::CreateDefault());
+
+  UpdateDisplay("3000x2000,800x600");
+  auto ids = display_manager()->GetCurrentDisplayIdList();
+  EnableTouch(ids[0]);
+  EnableTouch(ids[1]);
+
+  EXPECT_EQ(ids[0], GetPrimaryDisplay());
+  display_chooser->TryToPlaceUIOnTouchDisplay();
+
+  EXPECT_EQ(ids[0], GetPrimaryDisplay());
+}
+
+TEST_F(OobeDisplayChooserTest, PreferTouchAsPrimaryOnDisplayAdded) {
+  std::unique_ptr<OobeDisplayChooser> display_chooser(
+      OobeDisplayChooser::CreateDefault());
+  UpdateDisplay("3000x2000,800x600");
+  auto ids = display_manager()->GetCurrentDisplayIdList();

[jdufault, 2017/05/08 17:44:58]

nit: auto type is not obvious (for this entire file)

+  DisableTouch(ids[0]);
+  EnableTouch(ids[1]);
+
+  EXPECT_EQ(ids[0], GetPrimaryDisplay());
+  display_chooser->OnDisplayAdded(display_manager()->GetDisplayForId(ids[1]));
+
+  EXPECT_EQ(ids[1], GetPrimaryDisplay());
+}
+
+TEST_F(OobeDisplayChooserTest,
+       AddingSecondTouchDisplayShouldbeNOPOnDisplayAdded) {
+  std::unique_ptr<OobeDisplayChooser> display_chooser(
+      OobeDisplayChooser::CreateDefault());
+  UpdateDisplay("3000x2000,800x600,800x600");
+  auto ids = display_manager()->GetCurrentDisplayIdList();
+  DisableTouch(ids[0]);
+  EnableTouch(ids[1]);
+  EnableTouch(ids[2]);
+  ash::Shell::Get()->display_configuration_controller()->SetPrimaryDisplayId(
+      ids[1]);
+
+  EXPECT_EQ(ids[1], GetPrimaryDisplay());
+  display_chooser->OnDisplayAdded(display_manager()->GetDisplayForId(ids[2]));
+  EXPECT_EQ(ids[1], GetPrimaryDisplay());
+}
+
+}  // namespace chromeos