Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_panel_service.cc

Index: chromeos/dbus/ibus/ibus_panel_service.cc
diff --git a/chromeos/dbus/ibus/ibus_panel_service.cc b/chromeos/dbus/ibus/ibus_panel_service.cc
index 84f7760f5ea2340c5c4764b717669bca67312c38..adc6fad7da52b4bbe9f8445d49827db4c6f1f94e 100644
--- a/chromeos/dbus/ibus/ibus_panel_service.cc
+++ b/chromeos/dbus/ibus/ibus_panel_service.cc
@@ -19,8 +19,6 @@
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 class IBusPanelServiceImpl : public IBusPanelService {
  public:
@@ -200,8 +198,8 @@ class IBusPanelServiceImpl : public IBusPanelService {
       return;
 
     dbus::MessageReader reader(method_call);
-    ibus::IBusLookupTable table;
-    if (!ibus::PopIBusLookupTable(&reader, &table)) {
+    IBusLookupTable table;
+    if (!PopIBusLookupTable(&reader, &table)) {
       LOG(WARNING) << "UpdateLookupTable called with incorrect parameters: "
                    << method_call->ToString();
       return;
@@ -237,7 +235,7 @@ class IBusPanelServiceImpl : public IBusPanelService {
 
     dbus::MessageReader reader(method_call);
     std::string text;
-    if (!ibus::PopStringFromIBusText(&reader, &text)) {
+    if (!PopStringFromIBusText(&reader, &text)) {
       LOG(WARNING) << "UpdateAuxiliaryText called with incorrect parameters: "
                    << method_call->ToString();
       return;
@@ -272,7 +270,7 @@ class IBusPanelServiceImpl : public IBusPanelService {
 
     dbus::MessageReader reader(method_call);
     std::string text;
-    if (!ibus::PopStringFromIBusText(&reader, &text)) {
+    if (!PopStringFromIBusText(&reader, &text)) {
       LOG(WARNING) << "UpdatePreeditText called with incorrect parameters: "
                    << method_call->ToString();
       return;
@@ -313,8 +311,8 @@ class IBusPanelServiceImpl : public IBusPanelService {
       return;
 
     dbus::MessageReader reader(method_call);
-    ibus::IBusPropertyList properties;
-    if (!ibus::PopIBusPropertyList(&reader, &properties)) {
+    IBusPropertyList properties;
+    if (!PopIBusPropertyList(&reader, &properties)) {
       DLOG(WARNING) << "RegisterProperties called with incorrect parameters:"
                     << method_call->ToString();
       return;
@@ -332,8 +330,8 @@ class IBusPanelServiceImpl : public IBusPanelService {
       return;
 
     dbus::MessageReader reader(method_call);
-    ibus::IBusProperty property;
-    if (!ibus::PopIBusProperty(&reader, &property)) {
+    IBusProperty property;
+    if (!PopIBusProperty(&reader, &property)) {
       DLOG(WARNING) << "RegisterProperties called with incorrect parameters:"
                     << method_call->ToString();
       return;
@@ -460,5 +458,4 @@ IBusPanelService* IBusPanelService::Create(
   }
 }
 
-}  // namespace ibus
 }  // namespace chromeos