Update the pairing API to include configuration and enrollment.

components/pairing/bluetooth_controller_pairing_controller.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 "components/pairing/bluetooth_controller_pairing_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/pairing/bluetooth_pairing_constants.h"
 #include "components/pairing/pairing_api.pb.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "net/base/io_buffer.h"
 
 namespace {
-const char* kFakeEnrollmentDomain = "http://fake.com";
 const int kReceiveSize = 16384;
 }
 
 namespace pairing_chromeos {
 
 BluetoothControllerPairingController::BluetoothControllerPairingController()
     : current_stage_(STAGE_NONE),
       got_initial_status_(false),
       proto_decoder_(new ProtoDecoder(this)),
       ptr_factory_(this) {
@@ skipping 267 matching lines @@
     device->ConfirmPairing();
     // Once pairing is confirmed, the connection will either be successful, or
     // fail.  Either case is acceptable as long as the devices are paired.
   } else {
     device->RejectPairing();
     controller_device_id_.clear();
     RepeatDiscovery();
   }
 }
 
+void BluetoothControllerPairingController::SetHostConfiguration(
+    bool accepted_eula,
+    const std::string& lang,
+    const std::string& timezone,
+    bool send_reports,
+    const std::string& keyboard_layout) {
+  // TODO(zork): Get configuration from UI and send to Host.
+  // (http://crbug.com/405744)
+}
+
 void BluetoothControllerPairingController::OnAuthenticationDone(
-    const chromeos::UserContext& user_context,
-    content::BrowserContext* browser_context) {
+    const std::string& domain,
+    const std::string& auth_token) {
   DCHECK_EQ(current_stage_, STAGE_WAITING_FOR_CREDENTIALS);
 
-  // TODO(zork): Get configuration from UI and send to Host.
-  // (http://crbug.com/405744)
-
-  // TODO(zork): Get proper credentials. (http://crbug.com/405744)
-  // For now, send a fake domain.
   pairing_api::PairDevices pair_devices;
   pair_devices.set_api_version(kPairingAPIVersion);
-  pair_devices.mutable_parameters()->set_admin_access_token(
-      kFakeEnrollmentDomain);
+  pair_devices.mutable_parameters()->set_admin_access_token(auth_token);
 
   int size = 0;
   scoped_refptr<net::IOBuffer> io_buffer(
       ProtoDecoder::SendPairDevices(pair_devices, &size));
 
   socket_->Send(
       io_buffer, size,
       base::Bind(&BluetoothControllerPairingController::OnSendComplete,
                  ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothControllerPairingController::OnErrorWithMessage,
                  ptr_factory_.GetWeakPtr()));
   ChangeStage(STAGE_HOST_ENROLLMENT_IN_PROGRESS);
 }
 
 void BluetoothControllerPairingController::StartSession() {
   DCHECK_EQ(current_stage_, STAGE_PAIRING_DONE);
   ChangeStage(STAGE_FINISHED);
 }
 
 // ProtoDecoder::Observer:
 void BluetoothControllerPairingController::OnHostStatusMessage(
     const pairing_api::HostStatus& message) {
   if (got_initial_status_) {
-    if (message.parameters().has_domain()) {
-      // TODO(zork): Remove this if we don't actually need the domain for UI.
-      // (http://crbug.com/405761)
-      if (message.parameters().domain() == kFakeEnrollmentDomain) {
-        pairing_api::CompleteSetup complete_setup;
-        complete_setup.set_api_version(kPairingAPIVersion);
-        // TODO(zork): Get AddAnother from UI (http://crbug.com/405757)
-        complete_setup.mutable_parameters()->set_add_another(false);
+    // TODO(zork): Check that the domain matches. (http://crbug.com/405761)

[achuithb, 2014/08/27 22:04:05]

What are these changes? From a rebase?

+    // TODO(zork): Handling updating stages (http://crbug.com/405754).
+    pairing_api::CompleteSetup complete_setup;
+    complete_setup.set_api_version(kPairingAPIVersion);
+    // TODO(zork): Get AddAnother from UI (http://crbug.com/405757)
+    complete_setup.mutable_parameters()->set_add_another(false);
 
-        int size = 0;
-        scoped_refptr<net::IOBuffer> io_buffer(
-            ProtoDecoder::SendCompleteSetup(complete_setup, &size));
+    int size = 0;
+    scoped_refptr<net::IOBuffer> io_buffer(
+        ProtoDecoder::SendCompleteSetup(complete_setup, &size));
 
-        socket_->Send(
-            io_buffer, size,
-            base::Bind(&BluetoothControllerPairingController::OnSendComplete,
-                       ptr_factory_.GetWeakPtr()),
-            base::Bind(
-                &BluetoothControllerPairingController::OnErrorWithMessage,
-                ptr_factory_.GetWeakPtr()));
-        ChangeStage(STAGE_PAIRING_DONE);
-      } else {
-        ChangeStage(STAGE_HOST_ENROLLMENT_ERROR);
-      }
-    } else {
-      ChangeStage(STAGE_HOST_ENROLLMENT_ERROR);
-    }
+    socket_->Send(
+        io_buffer, size,
+        base::Bind(&BluetoothControllerPairingController::OnSendComplete,
+                   ptr_factory_.GetWeakPtr()),
+        base::Bind(
+            &BluetoothControllerPairingController::OnErrorWithMessage,
+            ptr_factory_.GetWeakPtr()));
+    ChangeStage(STAGE_PAIRING_DONE);
   } else {
     got_initial_status_ = true;
 
     // TODO(zork): Check domain. (http://crbug.com/405761)
-
-    // TODO(zork): Handling updating stages (http://crbug.com/405754).
     ChangeStage(STAGE_WAITING_FOR_CREDENTIALS);
   }
 }
 
 void BluetoothControllerPairingController::OnConfigureHostMessage(
     const pairing_api::ConfigureHost& message) {
   NOTREACHED();
 }
 
 void BluetoothControllerPairingController::OnPairDevicesMessage(
@@ skipping 67 matching lines @@
   ChangeStage(STAGE_WAITING_FOR_CODE_CONFIRMATION);
 }
 
 void BluetoothControllerPairingController::AuthorizePairing(
     device::BluetoothDevice* device) {
   // Disallow unknown device.
   device->RejectPairing();
 }
 
 }  // namespace pairing_chromeos