Switch to standard integer types in dbus/.

dbus/object_manager_unittest.cc

 // Copyright (c) 2013 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/object_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/property.h"
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace dbus {
 
 // The object manager test exercises the asynchronous APIs in ObjectManager,
 // and by extension PropertySet and Property<>.
 class ObjectManagerTest
     : public testing::Test,
       public ObjectManager::Interface {
  public:
   ObjectManagerTest() : timeout_expired_(false) {
   }
 
   struct Properties : public PropertySet {
     Property<std::string> name;
-    Property<int16> version;
+    Property<int16_t> version;
     Property<std::vector<std::string> > methods;
     Property<std::vector<ObjectPath> > objects;
 
     Properties(ObjectProxy* object_proxy,
                const std::string& interface_name,
                PropertyChangedCallback property_changed_callback)
         : PropertySet(object_proxy, interface_name, property_changed_callback) {
       RegisterProperty("Name", &name);
       RegisterProperty("Version", &version);
       RegisterProperty("Methods", &methods);
@@ skipping 361 matching lines @@
                  base::Unretained(this)),
       base::TimeDelta::FromSeconds(2));
 
   while (last_name_value_ != "ChangedTestServiceName" && !timeout_expired_) {
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
   }
 }
 
 }  // namespace dbus