Switch to standard integer types in chrome/browser/, part 3 of 4.

chrome/browser/profile_resetter/brandcoded_default_settings.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_PROFILE_RESETTER_BRANDCODED_DEFAULT_SETTINGS_H_
 #define CHROME_BROWSER_PROFILE_RESETTER_BRANDCODED_DEFAULT_SETTINGS_H_
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 // BrandcodedDefaultSettings provides a set of default settings
 // for ProfileResetter. They are specific to Chrome distribution channels.
 class BrandcodedDefaultSettings {
  public:
   BrandcodedDefaultSettings();
   // Constructs BrandcodedDefaultSettings directly from preferences.
   explicit BrandcodedDefaultSettings(const std::string& prefs);
@@ skipping 17 matching lines @@
 
  private:
   scoped_ptr<base::ListValue> ExtractList(const char* pref_name) const;
 
   scoped_ptr<base::DictionaryValue> master_dictionary_;
 
   DISALLOW_COPY_AND_ASSIGN(BrandcodedDefaultSettings);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_RESETTER_BRANDCODED_DEFAULT_SETTINGS_H_