commit 7cf2178ba333d4cd49b90c78818a6c22502dd4ac
author Alex Vakulenko <avakulenko@google.com> Fri Jan 08 22:07:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 08 22:07:28 2016 +0000
tree 704bb1a8274bf51acd01969a10220499fa2db697
parent 1cc9044ca41f0a7893943840d3cc2e0b758d7164
parent 210591e9a4f9628eeb3432f5d6cdb759755273e2

update_engine: Split out the trait name from the command name
am: 210591e9a4

* commit '210591e9a4f9628eeb3432f5d6cdb759755273e2':
  update_engine: Split out the trait name from the command name

weave_service.cc

diff --git a/weave_service.cc b/weave_service.cc
index 5825324..414234c 100644
--- a/weave_service.cc
+++ b/weave_service.cc
@@ -30,6 +30,7 @@
 namespace {
 
 const char kWeaveComponent[] = "updater";
+const char kWeaveTrait[] = "_updater";
 
 }  // namespace
 
@@ -51,14 +52,12 @@
   if (!weave_service)
     return;
 
-  weave_service->AddComponent(kWeaveComponent, {"_updater"}, nullptr);
+  weave_service->AddComponent(kWeaveComponent, {kWeaveTrait}, nullptr);
   weave_service->AddCommandHandler(
-      kWeaveComponent,
-      "_updater.checkForUpdates",
+      kWeaveComponent, kWeaveTrait, "checkForUpdates",
       base::Bind(&WeaveService::OnCheckForUpdates, base::Unretained(this)));
   weave_service->AddCommandHandler(
-      kWeaveComponent,
-      "_updater.trackChannel",
+      kWeaveComponent, kWeaveTrait, "trackChannel",
       base::Bind(&WeaveService::OnTrackChannel, base::Unretained(this)));
   UpdateWeaveState();
 }