AuthPolicyClient: Remove fallback to string

chromeos/dbus/auth_policy_client.cc

 // Copyright 2016 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/auth_policy_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
@@ skipping 113 matching lines @@
   void HandleAuthCallback(const AuthCallback& callback,
                           dbus::Response* response) {
     authpolicy::ActiveDirectoryAccountData account_data;
     if (!response) {
       DLOG(ERROR) << "Auth: Failed to  call to authpolicy";
       callback.Run(authpolicy::ERROR_DBUS_FAILURE, account_data);
       return;
     }
     dbus::MessageReader reader(response);
     const authpolicy::ErrorType error(GetErrorFromReader(&reader));
-    if (reader.PopArrayOfBytesAsProto(&account_data)) {
-      callback.Run(error, account_data);
+    if (!reader.PopArrayOfBytesAsProto(&account_data)) {
+      DLOG(ERROR) << "Failed to parse protobuf.";

[Thiemo Nagel, 2017/03/21 13:30:01]

Nit: Why not use LOG(ERROR)?

[Roman Sorokin (ftl), 2017/03/21 13:43:00]

Just not to bloat the binary. Should probably delete it cause there is LOG in
PopArrayOfBytesAsProto function

[Thiemo Nagel, 2017/03/21 13:45:37]

Sounds good.

+      callback.Run(authpolicy::ErrorType::ERROR_DBUS_FAILURE, account_data);
       return;
     }
-    DLOG(WARNING) << "Failed to parse protobuf. Fallback to string";
-    // TODO(rsorokin): Remove once both ChromiumOS and Chromium use protobuf.
-    std::string account_id;
-    if (!reader.PopString(&account_id))
-      DLOG(ERROR) << "Auth: Failed to get user_id from the response";
-    account_data.set_account_id(account_id);
     callback.Run(error, account_data);
   }
 
   dbus::Bus* bus_ = nullptr;
   dbus::ObjectProxy* proxy_ = nullptr;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<AuthPolicyClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AuthPolicyClientImpl);
 };
 
 }  // namespace
 
 AuthPolicyClient::AuthPolicyClient() {}
 
 AuthPolicyClient::~AuthPolicyClient() {}
 
 // static
 AuthPolicyClient* AuthPolicyClient::Create() {
   return new AuthPolicyClientImpl();
 }
 
 }  // namespace chromeos