Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/speech_synthesizer_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/system/runtime_environment.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 chromeos {
 
 // TODO(chaitanyag): rename to "locale" after making equivalent change in
 // Chrome OS code.
 const char SpeechSynthesizerClient::kSpeechPropertyLocale[] = "name";
 
 const char SpeechSynthesizerClient::kSpeechPropertyGender[] = "gender";
 const char SpeechSynthesizerClient::kSpeechPropertyRate[] = "rate";
 const char SpeechSynthesizerClient::kSpeechPropertyPitch[] = "pitch";
 const char SpeechSynthesizerClient::kSpeechPropertyVolume[] = "volume";
 const char SpeechSynthesizerClient::kSpeechPropertyEquals[] = "=";
 const char SpeechSynthesizerClient::kSpeechPropertyDelimiter[] = ";";
 
 class SpeechSynthesizerClientImpl : public SpeechSynthesizerClient {
  public:
   explicit SpeechSynthesizerClientImpl(dbus::Bus* bus)
       : proxy_(NULL),
         weak_ptr_factory_(this) {
     proxy_ = bus->GetObjectProxy(
         speech_synthesis::kSpeechSynthesizerServiceName,
-        dbus::ObjectPath(speech_synthesis::kSpeechSynthesizerServicePath));
+        speech_synthesis::kSpeechSynthesizerServicePath);
   }
   virtual ~SpeechSynthesizerClientImpl() {}
 
   virtual void Speak(const std::string& text,
                      const std::string& properties) OVERRIDE {
     dbus::MethodCall method_call(speech_synthesis::kSpeechSynthesizerInterface,
                                  speech_synthesis::kSpeak);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(text);
     writer.AppendString(properties);
@@ skipping 80 matching lines @@
 // static
 SpeechSynthesizerClient* SpeechSynthesizerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new SpeechSynthesizerClientImpl(bus);
   } else {
     return new SpeechSynthesizerClientStubImpl();
   }
 }
 
 }  // namespace chromeos