Replace cras properties with the ones rolled down in service_constants.h.

chromeos/dbus/cras_audio_client.cc

 // Copyright (c) 2013 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/cras_audio_client.h"
 
 #include "base/bind.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace {
-
-// TODO(jennyz): Remove this section and use the dbus properties constants
-// defined in service_constants.h, once the change is done in cros side for
-// service_constants.h and rolled down to chrome.
-const char kIsInputProperty[] = "IsInput";
-const char kIdProperty[] = "Id";
-const char kDeviceNameProperty[] = "DeviceName";
-const char kTypeProperty[] = "Type";
-const char kNameProperty[] = "Name";
-const char kActiveProperty[] = "Active";
-
-}  // namespace
-
 namespace chromeos {
 
 // The CrasAudioClient implementation used in production.
 class CrasAudioClientImpl : public CrasAudioClient {
  public:
   explicit CrasAudioClientImpl(dbus::Bus* bus)
       : cras_proxy_(NULL),
         weak_ptr_factory_(this) {
     cras_proxy_ = bus->GetObjectProxy(
         cras::kCrasServiceName,
@@ skipping 303 matching lines @@
     while (array_reader->HasMoreData()) {
       dbus::MessageReader dict_entry_reader(response);
       dbus::MessageReader value_reader(response);
       std::string key;
       if (!array_reader->PopDictEntry(&dict_entry_reader) ||
           !dict_entry_reader.PopString(&key) ||
           !dict_entry_reader.PopVariant(&value_reader)) {
          return false;
       }
 
-      if (key == kIsInputProperty) {
+      if (key == cras::kIsInputProperty) {
         if (!value_reader.PopBool(&node->is_input))
           return false;
-      } else if (key == kIdProperty) {
+      } else if (key == cras::kIdProperty) {
         if (!value_reader.PopUint64(&node->id))
           return false;
-      } else if (key == kDeviceNameProperty) {
+      } else if (key == cras::kDeviceNameProperty) {
         if (!value_reader.PopString(&node->device_name))
           return false;
-      } else if (key == kTypeProperty) {
+      } else if (key == cras::kTypeProperty) {
         if (!value_reader.PopString(&node->type))
           return false;
-      } else if (key == kNameProperty) {
+      } else if (key == cras::kNameProperty) {
         if (!value_reader.PopString(&node->name))
           return false;
-      } else if (key == kActiveProperty) {
+      } else if (key == cras::kActiveProperty) {
         if (!value_reader.PopBool(&node->active))
           return false;
       }
     }
 
     return true;
   }
 
   dbus::ObjectProxy* cras_proxy_;
   ObserverList<Observer> observers_;
@@ skipping 69 matching lines @@
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new CrasAudioClientImpl(bus);
   }
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new CrasAudioClientStubImpl();
 }
 
 }  // namespace chromeos