Clean Up: Gather ibus constants to ibus_constants.h

chromeos/dbus/ibus/ibus_client_unittest.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 "chromeos/dbus/ibus/ibus_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 58 matching lines @@
 
     message_loop_.PostTask(FROM_HERE, base::Bind(error_callback,
                                                  error_response_));
   }
 
  protected:
   virtual void SetUp() OVERRIDE {
     dbus::Bus::Options options;
     mock_bus_ = new dbus::MockBus(options);
     mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
-                                            kIBusServiceName,
-                                            dbus::ObjectPath(kIBusServicePath));
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(kIBusServiceName,
-                                           dbus::ObjectPath(kIBusServicePath)))
+                                            ibus::kServiceName,
+                                            dbus::ObjectPath(
+                                                ibus::bus::kServicePath));
+    EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
+                                           dbus::ObjectPath(
+                                               ibus::bus::kServicePath)))
         .WillOnce(Return(mock_proxy_.get()));
 
     EXPECT_CALL(*mock_bus_, ShutdownAndBlock());
     client_.reset(IBusClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                      mock_bus_));
   }
 
   virtual void TearDown() OVERRIDE {
     mock_bus_->ShutdownAndBlock();
   }
@@ skipping 107 matching lines @@
       base::Bind(&MockCreateInputContextCallback::Run,
                  base::Unretained(&callback)),
       base::Bind(&MockCreateInputContextErrorCallback::Run,
                  base::Unretained(&error_callback)));
 
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos