Switch to standard integer types in chromeos/.

chromeos/network/onc/onc_merger.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/network/onc/onc_merger.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "components/onc/onc_constants.h"
 
 namespace chromeos {
 namespace onc {
 namespace {
 
 typedef scoped_ptr<base::DictionaryValue> DictionaryPtr;
 
@@ skipping 480 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos