Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_input_context_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 "chromeos/dbus/ibus/ibus_input_context_client.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 
-// TODO(nona): Remove after complete libibus removal.
-using chromeos::ibus::IBusText;
+using chromeos::IBusText;
 
 namespace {
 
 // The IBusInputContextClient implementation.
 class IBusInputContextClientImpl : public IBusInputContextClient {
  public:
   IBusInputContextClientImpl()
       : proxy_(NULL),
         is_xkb_layout_(true),
         weak_ptr_factory_(this) {
@@ skipping 105 matching lines @@
   }
 
   // IBusInputContextClient override.
   virtual void SetSurroundingText(const std::string& text,
                                   uint32 start_index,
                                   uint32 end_index) OVERRIDE {
     dbus::MethodCall method_call(
         ibus::input_context::kServiceInterface,
         ibus::input_context::kSetSurroundingTextMethod);
     dbus::MessageWriter writer(&method_call);
-    ibus::AppendStringAsIBusText(text, &writer);
+    AppendStringAsIBusText(text, &writer);
     writer.AppendUint32(start_index);
     writer.AppendUint32(end_index);
     CallNoResponseMethod(&method_call,
                          ibus::input_context::kSetSurroundingTextMethod);
   }
 
   // IBusInputContextClient override.
   virtual void PropertyActivate(const std::string& key,
                                 ibus::IBusPropertyState state) OVERRIDE {
     dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
@@ skipping 305 matching lines @@
 // static
 IBusInputContextClient* IBusInputContextClient::Create(
     DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new IBusInputContextClientImpl();
   }
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new IBusInputContextClientDaemonlessImpl();
 }
 }  // namespace chromeos