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

chrome/browser/character_encoding.h

 // Copyright (c) 2006-2008 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_CHARACTER_ENCODING_H_
 #define CHROME_BROWSER_CHARACTER_ENCODING_H_
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 class CharacterEncoding {
  public:
   // Enumeration of the types of Browser encoding name we
   // currently support. This is defined outside of Browser
   // to avoid cyclical dependencies.
 
   // Structure to save encoding information.
   struct EncodingInfo {
@@ skipping 75 matching lines @@
   // valid, return corresponding encoding command id. Otherwise return 0;
   static int GetCommandIdByCanonicalEncodingName(
       const std::string& encoding_name);
 
  private:
   // Disallow instantiating it since this class only contains static methods.
   DISALLOW_IMPLICIT_CONSTRUCTORS(CharacterEncoding);
 };
 
 #endif  // CHROME_BROWSER_CHARACTER_ENCODING_H_