Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_property.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_property.h"
 
 #include <string>
 #include "base/logging.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_object.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/message.h"
 
 namespace chromeos {
-// TODO(nona): remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
                                      IBusProperty* property) {
   IBusObjectReader ibus_property_reader("IBusProperty", reader);
   if (!ibus_property_reader.Init())
     return false;
 
   std::string key;
   if (!ibus_property_reader.PopString(&key)) {
     LOG(ERROR) << "Invalid variant structure[IBusProperty]: "
@@ skipping 60 matching lines @@
                << "8th argument should be unsigned 32bit integer.";
     return false;
   }
 
   if (type > 3UL) {
     LOG(ERROR) << "Invalid value for IBusProperty.";
     return false;
   }
 
   DCHECK_LE(state, 3UL);
-  if (state == IBUS_PROPERTY_STATE_INCONSISTENT) {
+  if (state == ibus::IBUS_PROPERTY_STATE_INCONSISTENT) {
     LOG(ERROR) << "PROP_STATE_INCONSISTENT is not supported in Chrome OS.";
   } else {
-    property->set_checked(state == IBUS_PROPERTY_STATE_CHECKED);
+    property->set_checked(state == ibus::IBUS_PROPERTY_STATE_CHECKED);
   }
 
   if (!ibus_property_reader.PopIBusPropertyList(
       property->mutable_sub_properties())) {
     LOG(ERROR) << "Invalid variant structure[IBusProperty]: "
                << "9th argument should be IBusPropList.";
     return false;
   }
 
   return true;
@@ skipping 62 matching lines @@
 // IBusProperty
 IBusProperty::IBusProperty()
     : type_(IBUS_PROPERTY_TYPE_NORMAL),
       visible_(false),
       checked_(false) {
 }
 
 IBusProperty::~IBusProperty() {
 }
 
-}  // namespace ibus
 }  // namespace chromeos