AU: land http://codereview.chromium.org/2931008/show for tfarina

update_engine_client.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 <gflags/gflags.h>
 #include <glib.h>
 
 #include "update_engine/marshal.glibmarshal.h"
 #include "update_engine/dbus_constants.h"
 #include "update_engine/subprocess.h"
@@ skipping 50 matching lines @@
   LOG(INFO) << "  last_checked_time: " << last_checked_time;
   LOG(INFO) << "  progress: " << progress;
   LOG(INFO) << "  current_operation: " << current_operation;
   LOG(INFO) << "  new_version: " << new_version;
   LOG(INFO) << "  new_size: " << new_size;
 }
 
 bool GetStatus() {
   DBusGProxy* proxy;
   GError* error = NULL;
-  
+
   CHECK(GetProxy(&proxy));
 
   gint64 last_checked_time = 0;
   gdouble progress = 0.0;
   char* current_op = NULL;
   char* new_version = NULL;
   gint64 new_size = 0;
 
   gboolean rc = org_chromium_UpdateEngineInterface_get_status(
       proxy,
@@ skipping 12 matching lines @@
          progress,
          current_op,
          new_version,
          new_size);
   return true;
 }
 
 // Should never return.
 void WatchForUpdates() {
   DBusGProxy* proxy;
-  
+
   CHECK(GetProxy(&proxy));
-  
+
   // Register marshaller
   dbus_g_object_register_marshaller(
       update_engine_VOID__INT64_DOUBLE_STRING_STRING_INT64,
       G_TYPE_NONE,
       G_TYPE_INT64,
       G_TYPE_DOUBLE,
       G_TYPE_STRING,
       G_TYPE_STRING,
       G_TYPE_INT64,
       G_TYPE_INVALID);
-  
-  // TODO(adlr): make StatusUpdate a const string
+
+  static const char kStatusUpdate[] = "StatusUpdate";
   dbus_g_proxy_add_signal(proxy,
-                          "StatusUpdate",
+                          kStatusUpdate,
                           G_TYPE_INT64,
                           G_TYPE_DOUBLE,
                           G_TYPE_STRING,
                           G_TYPE_STRING,
                           G_TYPE_INT64,
                           G_TYPE_INVALID);
   GMainLoop* loop = g_main_loop_new (NULL, TRUE);
   dbus_g_proxy_connect_signal(proxy,
-                              "StatusUpdate",
+                              kStatusUpdate,
                               G_CALLBACK(StatusUpdateSignalHandler),
                               NULL,
                               NULL);
   g_main_loop_run(loop);
   g_main_loop_unref(loop);
 }
 
 bool CheckForUpdates(bool force) {
   DBusGProxy* proxy;
   GError* error = NULL;
-  
+
   CHECK(GetProxy(&proxy));
 
   gboolean rc =
       org_chromium_UpdateEngineInterface_check_for_update(proxy, &error);
   CHECK_EQ(rc, TRUE) << "Error checking for update: "
                      << GetGErrorMessage(error);
   return true;
 }
 
 }  // namespace {}
 
 int main(int argc, char** argv) {
   // Boilerplate init commands.
   g_type_init();
   g_thread_init(NULL);
   dbus_g_thread_init();
   chromeos_update_engine::Subprocess::Init();
   google::ParseCommandLineFlags(&argc, &argv, true);
-  
+
   if (FLAGS_status) {
     LOG(INFO) << "Querying Update Engine status...";
     if (!GetStatus()) {
       LOG(FATAL) << "GetStatus() failed.";
     }
     return 0;
   }
   if (FLAGS_force_update || FLAGS_check_for_update) {
     LOG(INFO) << "Initiating update check and install.";
     if (FLAGS_force_update) {
       LOG(INFO) << "Will not abort due to being on expensive network.";
     }
     CHECK(CheckForUpdates(FLAGS_force_update))
         << "Update check/initiate update failed.";
     return 0;
   }
   if (FLAGS_watch_for_updates) {
     LOG(INFO) << "Watching for status updates.";
     WatchForUpdates();  // Should never return.
     return 1;
   }
-  
+
   LOG(INFO) << "No flags specified. Exiting.";
   return 0;
 }