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

chrome/browser/icon_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_ICON_LOADER_H_
 #define CHROME_BROWSER_ICON_LOADER_H_
 
 #include "build/build_config.h"
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_WIN)
 // On Windows, we group files by their extension, with several exceptions:
 // .dll, .exe, .ico. See IconManager.h for explanation.
 typedef std::wstring IconGroupID;
@@ skipping 73 matching lines @@
   IconSize icon_size_;
 
   scoped_ptr<gfx::Image> image_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(IconLoader);
 };
 
 #endif  // CHROME_BROWSER_ICON_LOADER_H_