Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_engine_service_unittest.cc

Index: chromeos/dbus/ibus/ibus_engine_service_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index cecb59effec27b35f81f6a500cce2f97dcfc9d38..ae16d3ceb763e3674acd14a9d8eb2bdad9f74b00 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -36,7 +36,7 @@ class MockIBusEngineHandler : public IBusEngineHandlerInterface {
   MOCK_METHOD0(Enable, void());
   MOCK_METHOD0(Disable, void());
   MOCK_METHOD2(PropertyActivate, void(const std::string& property_name,
-                                      IBusPropertyState property_state));
+                                      ibus::IBusPropertyState property_state));
   MOCK_METHOD1(PropertyShow, void(const std::string& property_name));
   MOCK_METHOD1(PropertyHide, void(const std::string& property_name));
   MOCK_METHOD1(SetCapability, void(IBusCapability capability));
@@ -109,16 +109,16 @@ class BoolResponseExpectation {
 class RegisterPropertiesExpectation {
  public:
   explicit RegisterPropertiesExpectation(
-      const ibus::IBusPropertyList& property_list)
+      const IBusPropertyList& property_list)
       : property_list_(property_list) {}
 
   // Evaluates the given |signal| is a valid message.
   void Evaluate(dbus::Signal* signal) {
-    ibus::IBusPropertyList property_list;
+    IBusPropertyList property_list;
 
     // Read a signal argument.
     dbus::MessageReader reader(signal);
-    EXPECT_TRUE(ibus::PopIBusPropertyList(&reader, &property_list));
+    EXPECT_TRUE(PopIBusPropertyList(&reader, &property_list));
     EXPECT_FALSE(reader.HasMoreData());
 
     // Check an argument.
@@ -134,7 +134,7 @@ class RegisterPropertiesExpectation {
   }
 
  private:
-  const ibus::IBusPropertyList& property_list_;
+  const IBusPropertyList& property_list_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterPropertiesExpectation);
 };
@@ -188,7 +188,7 @@ class DelayProcessKeyEventHandler {
 class UpdatePreeditExpectation {
  public:
   UpdatePreeditExpectation(
-      const ibus::IBusText& ibus_text,
+      const IBusText& ibus_text,
       uint32 cursor_pos,
       bool is_visible,
       IBusEngineService::IBusEnginePreeditFocusOutMode mode)
@@ -199,14 +199,14 @@ class UpdatePreeditExpectation {
 
   // Evaluates the given |signal| is a valid message.
   void Evaluate(dbus::Signal* signal) {
-    ibus::IBusText ibus_text;
+    IBusText ibus_text;
     uint32 cursor_pos = 0;
     bool is_visible = false;
     uint32 preedit_mode = 0;
 
     // Read signal arguments.
     dbus::MessageReader reader(signal);
-    EXPECT_TRUE(ibus::PopIBusText(&reader, &ibus_text));
+    EXPECT_TRUE(PopIBusText(&reader, &ibus_text));
     EXPECT_TRUE(reader.PopUint32(&cursor_pos));
     EXPECT_TRUE(reader.PopBool(&is_visible));
     EXPECT_TRUE(reader.PopUint32(&preedit_mode));
@@ -222,7 +222,7 @@ class UpdatePreeditExpectation {
   }
 
  private:
-  const ibus::IBusText& ibus_text_;
+  const IBusText& ibus_text_;
   uint32 cursor_pos_;
   bool is_visible_;
   IBusEngineService::IBusEnginePreeditFocusOutMode mode_;
@@ -233,18 +233,18 @@ class UpdatePreeditExpectation {
 // Used for UpdateAuxiliaryText signal message evaluation.
 class UpdateAuxiliaryTextExpectation {
  public:
-  UpdateAuxiliaryTextExpectation(const ibus::IBusText& ibus_text,
+  UpdateAuxiliaryTextExpectation(const IBusText& ibus_text,
                                  bool is_visible)
       : ibus_text_(ibus_text), is_visible_(is_visible) {}
 
   // Evaluates the given |signal| is a valid message.
   void Evaluate(dbus::Signal* signal) {
-    ibus::IBusText ibus_text;
+    IBusText ibus_text;
     bool is_visible = false;
 
     // Read signal arguments.
     dbus::MessageReader reader(signal);
-    EXPECT_TRUE(ibus::PopIBusText(&reader, &ibus_text));
+    EXPECT_TRUE(PopIBusText(&reader, &ibus_text));
     EXPECT_TRUE(reader.PopBool(&is_visible));
     EXPECT_FALSE(reader.HasMoreData());
 
@@ -254,7 +254,7 @@ class UpdateAuxiliaryTextExpectation {
   }
 
  private:
-  const ibus::IBusText& ibus_text_;
+  const IBusText& ibus_text_;
   bool is_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateAuxiliaryTextExpectation);
@@ -263,13 +263,13 @@ class UpdateAuxiliaryTextExpectation {
 // Used for UpdateLookupTable signal message evaluation.
 class UpdateLookupTableExpectation {
  public:
-  UpdateLookupTableExpectation(const ibus::IBusLookupTable& lookup_table,
+  UpdateLookupTableExpectation(const IBusLookupTable& lookup_table,
                                bool is_visible)
       : lookup_table_(lookup_table), is_visible_(is_visible) {}
 
   // Evaluates the given |signal| is a valid message.
   void Evaluate(dbus::Signal* signal) {
-    ibus::IBusLookupTable lookup_table;
+    IBusLookupTable lookup_table;
     bool is_visible = false;
 
     // Read signal arguments.
@@ -287,7 +287,7 @@ class UpdateLookupTableExpectation {
   }
 
  private:
-  const ibus::IBusLookupTable& lookup_table_;
+  const IBusLookupTable& lookup_table_;
   bool is_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateLookupTableExpectation);
@@ -296,12 +296,12 @@ class UpdateLookupTableExpectation {
 // Used for UpdateProperty signal message evaluation.
 class UpdatePropertyExpectation {
  public:
-  explicit UpdatePropertyExpectation(const ibus::IBusProperty& property)
+  explicit UpdatePropertyExpectation(const IBusProperty& property)
       : property_(property) {}
 
   // Evaluates the given |signal| is a valid message.
   void Evaluate(dbus::Signal* signal) {
-    ibus::IBusProperty property;
+    IBusProperty property;
 
     // Read a signal argument.
     dbus::MessageReader reader(signal);
@@ -318,7 +318,7 @@ class UpdatePropertyExpectation {
   }
 
  private:
-  const ibus::IBusProperty& property_;
+  const IBusProperty& property_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdatePropertyExpectation);
 };
@@ -649,8 +649,8 @@ TEST_F(IBusEngineServiceTest, PropertyActivateTest) {
   // Set expectations.
   const uint32 kSerialNo = 1;
   const std::string kPropertyName = "Property Name";
-  const IBusEngineHandlerInterface::IBusPropertyState kIBusPropertyState =
-      IBusEngineHandlerInterface::IBUS_PROPERTY_STATE_UNCHECKED;
+  const ibus::IBusPropertyState kIBusPropertyState =
+      ibus::IBUS_PROPERTY_STATE_UNCHECKED;
   EXPECT_CALL(*engine_handler_, PropertyActivate(kPropertyName,
                                                  kIBusPropertyState));
   MockResponseSender response_sender;
@@ -1009,10 +1009,10 @@ TEST_F(IBusEngineServiceTest, SetSurroundingTextTest) {
 
 TEST_F(IBusEngineServiceTest, RegisterProperties) {
   // Set expectations.
-  ibus::IBusPropertyList property_list;
-  property_list.push_back(new ibus::IBusProperty());
+  IBusPropertyList property_list;
+  property_list.push_back(new IBusProperty());
   property_list[0]->set_key("Sample Key");
-  property_list[0]->set_type(ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU);
+  property_list[0]->set_type(IBusProperty::IBUS_PROPERTY_TYPE_MENU);
   property_list[0]->set_label("Sample Label");
   property_list[0]->set_tooltip("Sample Tooltip");
   property_list[0]->set_visible(true);
@@ -1028,7 +1028,7 @@ TEST_F(IBusEngineServiceTest, RegisterProperties) {
 
 TEST_F(IBusEngineServiceTest, UpdatePreeditTest) {
   // Set expectations.
-  ibus::IBusText ibus_text;
+  IBusText ibus_text;
   ibus_text.set_text("Sample Text");
   const uint32 kCursorPos = 9;
   const bool kIsVisible = false;
@@ -1044,7 +1044,7 @@ TEST_F(IBusEngineServiceTest, UpdatePreeditTest) {
 }
 
 TEST_F(IBusEngineServiceTest, UpdateAuxiliaryText) {
-  ibus::IBusText ibus_text;
+  IBusText ibus_text;
   ibus_text.set_text("Sample Text");
   const bool kIsVisible = false;
   UpdateAuxiliaryTextExpectation expectation(ibus_text, kIsVisible);
@@ -1058,7 +1058,7 @@ TEST_F(IBusEngineServiceTest, UpdateAuxiliaryText) {
 }
 
 TEST_F(IBusEngineServiceTest, UpdateLookupTableTest) {
-  ibus::IBusLookupTable lookup_table;
+  IBusLookupTable lookup_table;
   lookup_table.set_page_size(10);
   lookup_table.set_cursor_position(2);
   lookup_table.set_is_cursor_visible(false);
@@ -1074,9 +1074,9 @@ TEST_F(IBusEngineServiceTest, UpdateLookupTableTest) {
 }
 
 TEST_F(IBusEngineServiceTest, UpdatePropertyTest) {
-  ibus::IBusProperty property;
+  IBusProperty property;
   property.set_key("Sample Key");
-  property.set_type(ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU);
+  property.set_type(IBusProperty::IBUS_PROPERTY_TYPE_MENU);
   property.set_label("Sample Label");
   property.set_tooltip("Sample Tooltip");
   property.set_visible(true);