Add LoadComponent API in ImageLoader dbus adapter.

chromeos/dbus/image_loader_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/image_loader_client.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
@@ skipping 19 matching lines @@
                                  imageloader::kRegisterComponent);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     writer.AppendString(version);
     writer.AppendString(component_folder_abs_path);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&ImageLoaderClientImpl::OnBoolMethod, callback));
   }
 
+  void LoadComponent(const std::string& name,
+                     const StringDBusMethodCallback& callback) override {
+    dbus::MethodCall method_call(imageloader::kImageLoaderServiceInterface,
+                                 imageloader::kLoadComponent);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(name);
+    proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&ImageLoaderClientImpl::OnStringMethod, callback));
+  }
+
  protected:
   // DBusClient override.
   void Init(dbus::Bus* bus) override {
     proxy_ = bus->GetObjectProxy(
         imageloader::kImageLoaderServiceName,
         dbus::ObjectPath(imageloader::kImageLoaderServicePath));
   }
 
  private:
   static void OnBoolMethod(const BoolDBusMethodCallback& callback,
                            dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, false);
       return;
     }
     dbus::MessageReader reader(response);
     bool result = false;
     if (!reader.PopBool(&result)) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, false);
       LOG(ERROR) << "Invalid response: " << response->ToString();
       return;
     }
     callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
   }
 
+  static void OnStringMethod(const StringDBusMethodCallback& callback,
+                             dbus::Response* response) {
+    if (!response) {
+      callback.Run(DBUS_METHOD_CALL_FAILURE, "");
+      return;
+    }
+    dbus::MessageReader reader(response);
+    std::string result = "";

[Sorin Jianu, 2017/03/06 19:33:17]

doesn't need the "" initialization. The default ctor does that.

[xiaochu, 2017/03/06 20:28:24]

Done.

+    if (!reader.PopString(&result)) {
+      callback.Run(DBUS_METHOD_CALL_FAILURE, "");
+      LOG(ERROR) << "Invalid response: " << response->ToString();
+      return;
+    }
+    callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
+  }
+
   dbus::ObjectProxy* proxy_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ImageLoaderClientImpl);
 };
 
 }  // namespace
 
 ImageLoaderClient::ImageLoaderClient() {}
 
 ImageLoaderClient::~ImageLoaderClient() {}
 
 // static
 ImageLoaderClient* ImageLoaderClient::Create() {
   return new ImageLoaderClientImpl();
 }
 
 }  // namespace chromeos