1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)…

components/pairing/fake_host_pairing_controller.cc

Index: components/pairing/fake_host_pairing_controller.cc
diff --git a/components/pairing/fake_host_pairing_controller.cc b/components/pairing/fake_host_pairing_controller.cc
index ebd708474931c0e378e086f340e6fe89e9f8ae1b..127fb2dc437a5789d236abff93da058f24cfc753 100644
--- a/components/pairing/fake_host_pairing_controller.cc
+++ b/components/pairing/fake_host_pairing_controller.cc
@@ -72,13 +72,6 @@ void FakeHostPairingController::ApplyConfig(const std::string& config) {
   enrollment_domain_ = dict.count("domain") ? dict["domain"] : "example.com";
 }
 
-void FakeHostPairingController::ChangeStage(Stage new_stage) {
-  if (current_stage_ == new_stage)
-    return;
-  current_stage_ = new_stage;
-  FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
-}
-
 void FakeHostPairingController::ChangeStageLater(Stage new_stage) {
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
@@ -100,6 +93,13 @@ HostPairingController::Stage FakeHostPairingController::GetCurrentStage() {
   return current_stage_;
 }
 
+void FakeHostPairingController::ChangeStage(Stage new_stage) {
+  if (current_stage_ == new_stage)
+    return;
+  current_stage_ = new_stage;
+  FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
+}
+
 void FakeHostPairingController::StartPairing() {
   CHECK(current_stage_ == STAGE_NONE);
   if (start_after_update_) {