Cleanup: Put DBus unit tests in the dbus namespace, so one does not need to write dbus:: everywhere…

dbus/message.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 "dbus/message.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
@@ skipping 434 matching lines @@
   response->Init(dbus_message_new_error(method_call->raw_message(),
                                         error_name.c_str(),
                                         error_message.c_str()));
   return response.Pass();
 }
 
 //
 // MessageWriter implementation.
 //
 
-MessageWriter::MessageWriter(Message* message) :
-    message_(message),
-    container_is_open_(false) {
+MessageWriter::MessageWriter(Message* message)
+    : message_(message),
+      container_is_open_(false) {
   memset(&raw_message_iter_, 0, sizeof(raw_message_iter_));
   if (message)
     dbus_message_iter_init_append(message_->raw_message(), &raw_message_iter_);
 }
 
 MessageWriter::~MessageWriter() {
 }
 
 void MessageWriter::AppendByte(uint8 value) {
   AppendBasic(DBUS_TYPE_BYTE, &value);
@@ skipping 491 matching lines @@
 
   if (!CheckDataType(dbus_type))
     return false;
   dbus_message_iter_recurse(&raw_message_iter_,
                             &sub_reader->raw_message_iter_);
   dbus_message_iter_next(&raw_message_iter_);
   return true;
 }
 
 bool MessageReader::PopVariantOfBasic(int dbus_type, void* value) {
-  dbus::MessageReader variant_reader(message_);
+  MessageReader variant_reader(message_);
   if (!PopVariant(&variant_reader))
     return false;
   return variant_reader.PopBasic(dbus_type, value);
 }
 
 bool MessageReader::PopFileDescriptor(FileDescriptor* value) {
   CHECK(IsDBusTypeUnixFdSupported());
 
   int fd = -1;
   const bool success = PopBasic(DBUS_TYPE_UNIX_FD, &fd);
   if (!success)
     return false;
 
   value->PutValue(fd);
   // NB: the caller must check validity before using the value
   return true;
 }
 
 }  // namespace dbus