Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_input_context_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_input_context_client.h"
 
 #include <map>
 #include <string>
 #include "base/message_loop.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/message.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::_;
 
 namespace chromeos {
 
 // TODO(nona): Remove after complete libibus removal.
-using chromeos::ibus::IBusText;
+using chromeos::IBusText;
 
 namespace {
 const char kObjectPath[] = "/org/freedesktop/IBus/InputContext_1010";
 
 // Following variables are used in callback expectations.
 const uint32 kCapabilities = 12345;
 const int32 kCursorX = 30;
 const int32 kCursorY = 31;
 const int32 kCursorWidth = 32;
 const int32 kCursorHeight = 33;
@@ skipping 222 matching lines @@
       const dbus::ObjectProxy::ErrorCallback& error_callback) {
     EXPECT_EQ(ibus::input_context::kServiceInterface,
               method_call->GetInterface());
     EXPECT_EQ(ibus::input_context::kSetSurroundingTextMethod,
               method_call->GetMember());
     dbus::MessageReader reader(method_call);
     std::string text;
     uint32 cursor_pos = 0;
     uint32 anchor_pos = 0;
 
-    EXPECT_TRUE(ibus::PopStringFromIBusText(&reader, &text));
+    EXPECT_TRUE(PopStringFromIBusText(&reader, &text));
     EXPECT_TRUE(reader.PopUint32(&cursor_pos));
     EXPECT_TRUE(reader.PopUint32(&anchor_pos));
     EXPECT_FALSE(reader.HasMoreData());
 
     EXPECT_EQ(kSurroundingText, text);
     EXPECT_EQ(kCursorPos, cursor_pos);
     EXPECT_EQ(kAnchorPos, anchor_pos);
 
     message_loop_.PostTask(FROM_HERE, base::Bind(callback, response_));
   }
@@ skipping 337 matching lines @@
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCursorLocation.
   client_->PropertyActivate(kPropertyKey, kPropertyState);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 }  // namespace chromeos