Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_object.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_object.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/dbus/ibus/ibus_property.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/message.h"
 #include "dbus/values_util.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 ///////////////////////////////////////////////////////////////////////////////
 // IBusObjectReader
 IBusObjectReader::IBusObjectReader(const std::string& type_name,
                                    dbus::MessageReader* reader)
     : type_name_(type_name),
       original_reader_(reader),
       top_variant_reader_(NULL),
       contents_reader_(NULL),
       check_result_(IBUS_OBJECT_NOT_CHECKED) {
@@ skipping 122 matching lines @@
 
 bool IBusObjectReader::PopArray(dbus::MessageReader* reader) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopArray(reader);
 }
 
 bool IBusObjectReader::PopIBusText(IBusText* text) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
-  return IsValid() && chromeos::ibus::PopIBusText(contents_reader_.get(), text);
+  return IsValid() && chromeos::PopIBusText(contents_reader_.get(), text);
 }
 
 bool IBusObjectReader::PopStringFromIBusText(std::string* text) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
-  return IsValid() && chromeos::ibus::PopStringFromIBusText(
+  return IsValid() && chromeos::PopStringFromIBusText(
       contents_reader_.get(), text);
 }
 
 bool IBusObjectReader::PopIBusProperty(IBusProperty* property) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
-  return IsValid() && chromeos::ibus::PopIBusProperty(contents_reader_.get(),
+  return IsValid() && chromeos::PopIBusProperty(contents_reader_.get(),
                                                       property);
 }
 
 bool IBusObjectReader::PopIBusPropertyList(IBusPropertyList* properties) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
-  return IsValid() && chromeos::ibus::PopIBusPropertyList(
+  return IsValid() && chromeos::PopIBusPropertyList(
       contents_reader_.get(), properties);
 }
 
 const base::Value* IBusObjectReader::GetAttachment(const std::string& key) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   if (!IsValid())
     return NULL;
   std::map<std::string, base::Value*>::iterator it = attachments_.find(key);
   if (it == attachments_.end())
@@ skipping 56 matching lines @@
 }
 
 void IBusObjectWriter::OpenArray(const std::string& signature,
                                  dbus::MessageWriter* writer) {
   DCHECK_EQ(state_, INITIALIZED);
   contents_writer_->OpenArray(signature, writer);
 }
 
 void IBusObjectWriter::AppendIBusText(const IBusText& text) {
   DCHECK_EQ(state_, INITIALIZED);
-  chromeos::ibus::AppendIBusText(text, contents_writer_.get());
+  chromeos::AppendIBusText(text, contents_writer_.get());
 }
 
 void IBusObjectWriter::AppendStringAsIBusText(const std::string& text) {
   DCHECK_EQ(state_, INITIALIZED);
-  chromeos::ibus::AppendStringAsIBusText(text, contents_writer_.get());
+  chromeos::AppendStringAsIBusText(text, contents_writer_.get());
 }
 
 void IBusObjectWriter::AppendIBusProperty(const IBusProperty& property) {
   DCHECK_EQ(state_, INITIALIZED);
-  chromeos::ibus::AppendIBusProperty(property, contents_writer_.get());
+  chromeos::AppendIBusProperty(property, contents_writer_.get());
 }
 
 void IBusObjectWriter::AppendIBusPropertyList(
     const IBusPropertyList& property_list) {
   DCHECK_EQ(state_, INITIALIZED);
-  chromeos::ibus::AppendIBusPropertyList(property_list, contents_writer_.get());
+  chromeos::AppendIBusPropertyList(property_list, contents_writer_.get());
 }
 
 void IBusObjectWriter::CloseContainer(dbus::MessageWriter* writer) {
   DCHECK_EQ(state_, INITIALIZED);
   contents_writer_->CloseContainer(writer);
 }
 
 void IBusObjectWriter::AppendIBusObject(IBusObjectWriter* writer) {
   DCHECK_EQ(state_, INITIALIZED);
   writer->InitWithParentWriter(contents_writer_.get());
@@ skipping 54 matching lines @@
   dict_writer.AppendString(key);
   dbus::MessageWriter variant_writer(NULL);
   dict_writer.OpenVariant("v", &variant_writer);
 
   dbus::AppendBasicTypeValueDataAsVariant(&variant_writer, value);
   dict_writer.CloseContainer(&variant_writer);
   attachment_writer_->CloseContainer(&variant_writer);
   return true;
 }
 
-}  // namespace ibus
 }  // namespace chromeos