Add support to update_engine_client for -app_version and -omaha_url.

dbus_service.cc

 // Copyright (c) 2010 The Chromium OS 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 "update_engine/dbus_service.h"
 #include <string>
 #include "base/logging.h"
 #include "update_engine/marshal.glibmarshal.h"
 
 using std::string;
 
 G_DEFINE_TYPE(UpdateEngineService, update_engine_service, G_TYPE_OBJECT)
 
 static void update_engine_service_finalize(GObject* object) {
   G_OBJECT_CLASS(update_engine_service_parent_class)->finalize(object);
 }
 
 static guint status_update_signal = 0;
 
 static void update_engine_service_class_init(UpdateEngineServiceClass* klass) {
   GObjectClass *object_class;
   object_class = G_OBJECT_CLASS(klass);
   object_class->finalize = update_engine_service_finalize;
-  
+
   status_update_signal = g_signal_new(
       "status_update",
       G_OBJECT_CLASS_TYPE(klass),
       G_SIGNAL_RUN_LAST,
       0,  // 0 == no class method associated
       NULL,  // Accumulator
       NULL,  // Accumulator data
       update_engine_VOID__INT64_DOUBLE_STRING_STRING_INT64,
       G_TYPE_NONE,  // Return type
       5,  // param count:
@@ skipping 14 matching lines @@
 
 gboolean update_engine_service_get_status(UpdateEngineService* self,
                                           int64_t* last_checked_time,
                                           double* progress,
                                           gchar** current_operation,
                                           gchar** new_version,
                                           int64_t* new_size,
                                           GError **error) {
   string current_op;
   string new_version_str;
-  
+
   CHECK(self->update_attempter_->GetStatus(last_checked_time,
                                            progress,
                                            &current_op,
                                            &new_version_str,
                                            new_size));
-  
+
   *current_operation = strdup(current_op.c_str());
   *new_version = strdup(new_version_str.c_str());
   return TRUE;
 }
 
-gboolean update_engine_service_check_for_update(UpdateEngineService* self,
-                                                GError **error) {
-  self->update_attempter_->CheckForUpdate();
+gboolean update_engine_service_attempt_update(UpdateEngineService* self,
+                                              gchar* app_version,
+                                              gchar* omaha_url,
+                                              GError **error) {
+  const string update_app_version = app_version ? app_version : "";
+  const string update_omaha_url = omaha_url ? omaha_url : "";
+  LOG(INFO) << "Attempt update: app_version=\"" << update_app_version << "\" "
+            << "omaha_url=\"" << update_omaha_url << "\"";
+  self->update_attempter_->CheckForUpdate(app_version, omaha_url);
   return TRUE;
 }
 
+gboolean update_engine_service_check_for_update(UpdateEngineService* self,
+                                                GError **error) {
+  self->update_attempter_->CheckForUpdate("", "");
+  return TRUE;
+}
+
 gboolean update_engine_service_emit_status_update(
     UpdateEngineService* self,
     gint64 last_checked_time,
     gdouble progress,
     const gchar* current_operation,
     const gchar* new_version,
     gint64 new_size) {
   g_signal_emit(self,
                 status_update_signal,
                 0,
                 last_checked_time,
                 progress,
                 current_operation,
                 new_version,
                 new_size);
   return TRUE;
 }