Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_object_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.
 // TODO(nona): Add more test case, especially fail case.
 
 #include "chromeos/dbus/ibus/ibus_object.h"
 
 #include <string>
 #include <vector>
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "dbus/message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 TEST(IBusObjectTest, WriteReadTest) {
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(message.get());
 
   const char kSampleTypeName1[] = "Sample Type Name 1";
   const char kSampleTypeName2[] = "Sample Type Name 2";
   const char kSampleText1[] = "Sample Text 1";
   const char kSampleText2[] = "Sample Text 2";
   const uint32 kSampleUint32 = 12345UL;
@@ skipping 155 matching lines @@
   const char kSampleKey[] = "Key";
   const IBusProperty::IBusPropertyType kSampleType =
       IBusProperty::IBUS_PROPERTY_TYPE_MENU;
   const char kSampleLabel[] = "Label";
   const char kSampleTooltip[] = "Tooltip";
   const bool kSampleVisible = true;
   const bool kSampleChecked = false;
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Create IBusProperty.
-  ibus::IBusProperty property;
+  IBusProperty property;
   property.set_key(kSampleKey);
   property.set_type(kSampleType);
   property.set_label(kSampleLabel);
   property.set_tooltip(kSampleTooltip);
   property.set_visible(kSampleVisible);
   property.set_checked(kSampleChecked);
 
   // Write a IBusProperty.
   dbus::MessageWriter writer(response.get());
   IBusObjectWriter ibus_object_writer(kSampleTypeName, "v", &writer);
   ibus_object_writer.CloseHeader();
   ibus_object_writer.AppendIBusProperty(property);
   ibus_object_writer.CloseAll();
 
   // Read string from IBusText.
   dbus::MessageReader reader(response.get());
   IBusObjectReader ibus_object_reader(kSampleTypeName, &reader);
-  ibus::IBusProperty result_property;
+  IBusProperty result_property;
   ASSERT_TRUE(ibus_object_reader.Init());
   ASSERT_TRUE(ibus_object_reader.PopIBusProperty(&result_property));
   EXPECT_EQ(kSampleKey, result_property.key());
   EXPECT_EQ(kSampleType, result_property.type());
   EXPECT_EQ(kSampleLabel, result_property.label());
   EXPECT_EQ(kSampleTooltip, result_property.tooltip());
   EXPECT_EQ(kSampleVisible, result_property.visible());
   EXPECT_EQ(kSampleChecked, result_property.checked());
 }
 
-}  // namespace ibus
 }  // namespace chromeos