Roll src/third_party/cros_system_api/ c6eab9e4d..6139ae009 + API change

chromeos/dbus/biod/biod_client.cc

 // 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 "chromeos/dbus/biod/biod_client.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/stringprintf.h"
 #include "chromeos/dbus/biod/fake_biod_client.h"
+#include "chromeos/dbus/biod/messages.pb.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 
 namespace {
 
-// TODO(xiaoyinh@): Use the constant from service_constants.h
-// crbug.com/713420
-const char kBiometricsManagerPath[] =
-    "/org/chromium/BiometricsDaemon/FpcBiometricsManager";
-
 // D-Bus response handler for methods that use void callbacks.
 void OnVoidResponse(const VoidDBusMethodCallback& callback,
                     dbus::Response* response) {
   callback.Run(response ? DBUS_METHOD_CALL_SUCCESS : DBUS_METHOD_CALL_FAILURE);
 }
 
 }  // namespace
 
 // The BiodClient implementation used in production.
 class BiodClientImpl : public BiodClient {
@@ skipping 167 matching lines @@
     record_proxy->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BiodClientImpl::OnRequestRecordLabel,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  protected:
   void Init(dbus::Bus* bus) override {
     bus_ = bus;
 
-    biod_proxy_ = bus->GetObjectProxy(biod::kBiodServiceName,
-                                      dbus::ObjectPath(kBiometricsManagerPath));
+    dbus::ObjectPath fpc_bio_path = dbus::ObjectPath(base::StringPrintf(
+        "%s/%s", biod::kBiodServicePath, biod::kFpcBiometricsManagerName));
+    biod_proxy_ = bus->GetObjectProxy(biod::kBiodServiceName, fpc_bio_path);
 
     biod_proxy_->SetNameOwnerChangedCallback(
         base::Bind(&BiodClientImpl::NameOwnerChangedReceived,
                    weak_ptr_factory_.GetWeakPtr()));
 
     biod_proxy_->ConnectToSignal(
         biod::kBiometricsManagerInterface,
         biod::kBiometricsManagerEnrollScanDoneSignal,
         base::Bind(&BiodClientImpl::EnrollScanDoneReceived,
                    weak_ptr_factory_.GetWeakPtr()),
@@ skipping 105 matching lines @@
     current_auth_session_path_.reset();
 
     if (!new_owner.empty()) {
       for (auto& observer : observers_)
         observer.BiodServiceRestarted();
     }
   }
 
   void EnrollScanDoneReceived(dbus::Signal* signal) {
     dbus::MessageReader reader(signal);
-    uint32_t scan_result;
-    bool enroll_session_complete;
-    if (!reader.PopUint32(&scan_result) ||
-        !reader.PopBool(&enroll_session_complete)) {
-      LOG(ERROR) << "Error reading signal from biometrics: "
-                 << signal->ToString();
+    biod::EnrollScanDone protobuf;
+

[Daniel Erat, 2017/05/03 20:47:34]

nit: delete this blank line

[xiaoyinh(OOO Sep 11-29), 2017/05/04 00:29:51]

Done.

+    if (!reader.PopArrayOfBytesAsProto(&protobuf)) {
+      LOG(ERROR) << "Unable to decode protocol buffer from "
+                 << biod::kBiometricsManagerEnrollScanDoneSignal << " signal.";
       return;
     }
 
-    if (enroll_session_complete)
-      current_enroll_session_path_.reset();
+    biod::ScanResult scan_result = protobuf.scan_result();
+    bool enroll_session_complete = protobuf.done();
+    int32_t percent_complete =
+        protobuf.has_percent_complete() ? protobuf.percent_complete() : -1;

[Daniel Erat, 2017/05/03 20:47:34]

i can understand caching percent_complete in a local variable, but i'd just
inline the scan_result() and protobuf.done() calls in the observer call unless
there's a good reason not to.

[xiaoyinh(OOO Sep 11-29), 2017/05/04 00:29:51]

Thanks, changed.

 
     for (auto& observer : observers_) {
-      observer.BiodEnrollScanDoneReceived(
-          static_cast<biod::ScanResult>(scan_result), enroll_session_complete);
+      observer.BiodEnrollScanDoneReceived(scan_result, enroll_session_complete,
+                                          percent_complete);
     }
   }
 
   void AuthScanDoneReceived(dbus::Signal* signal) {
     dbus::MessageReader signal_reader(signal);
     dbus::MessageReader array_reader(nullptr);
     uint32_t scan_result;
     AuthScanMatches matches;
     if (!signal_reader.PopUint32(&scan_result) ||
         !signal_reader.PopArray(&array_reader)) {
@@ skipping 47 matching lines @@
 
 // static
 BiodClient* BiodClient::Create(DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new BiodClientImpl();
   DCHECK_EQ(FAKE_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBiodClient();
 }
 
 }  // namespace chromeos