From c72c89bd75dbaf3d22d9242b04b0c23482836130 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 8 Mar 2016 10:14:16 +0900
Subject: [PATCH] No more basictypes.h

---
 brightray/browser/devtools_contents_resizing_strategy.h | 2 +-
 brightray/browser/devtools_manager_delegate.h           | 2 +-
 brightray/browser/inspectable_web_contents_impl.cc      | 4 ++--
 brightray/browser/inspectable_web_contents_impl.h       | 4 ++--
 brightray/browser/web_ui_controller_factory.h           | 2 +-
 brightray/browser/win/scoped_hstring.h                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/brightray/browser/devtools_contents_resizing_strategy.h b/brightray/browser/devtools_contents_resizing_strategy.h
index 9c82c060b1e7..c48272f79774 100644
--- a/brightray/browser/devtools_contents_resizing_strategy.h
+++ b/brightray/browser/devtools_contents_resizing_strategy.h
@@ -5,7 +5,7 @@
 #ifndef BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
 #define BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h
index ed8e357482b2..12eedc66082f 100644
--- a/brightray/browser/devtools_manager_delegate.h
+++ b/brightray/browser/devtools_manager_delegate.h
@@ -5,7 +5,7 @@
 #ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
 #define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/compiler_specific.h"
 #include "components/devtools_http_handler/devtools_http_handler_delegate.h"
 #include "content/public/browser/devtools_manager_delegate.h"
diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc
index 1ff21b694a05..b876ef86288d 100644
--- a/brightray/browser/inspectable_web_contents_impl.cc
+++ b/brightray/browser/inspectable_web_contents_impl.cc
@@ -592,9 +592,9 @@ void InspectableWebContentsImpl::WebContentsDestroyed() {
 
 bool InspectableWebContentsImpl::AddMessageToConsole(
     content::WebContents* source,
-    int32 level,
+    int32_t level,
     const base::string16& message,
-    int32 line_no,
+    int32_t line_no,
     const base::string16& source_id) {
   logging::LogMessage("CONSOLE", line_no, level).stream() << "\"" <<
       message << "\", source: " << source_id << " (" << line_no << ")";
diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h
index 9b985bbc6c96..8543f5e99e77 100644
--- a/brightray/browser/inspectable_web_contents_impl.h
+++ b/brightray/browser/inspectable_web_contents_impl.h
@@ -134,9 +134,9 @@ class InspectableWebContentsImpl :
 
   // content::WebContentsDelegate:
   bool AddMessageToConsole(content::WebContents* source,
-                           int32 level,
+                           int32_t level,
                            const base::string16& message,
-                           int32 line_no,
+                           int32_t line_no,
                            const base::string16& source_id) override;
   bool ShouldCreateWebContents(
       content::WebContents* web_contents,
diff --git a/brightray/browser/web_ui_controller_factory.h b/brightray/browser/web_ui_controller_factory.h
index 44a77da5f1ea..ca86de6baa65 100644
--- a/brightray/browser/web_ui_controller_factory.h
+++ b/brightray/browser/web_ui_controller_factory.h
@@ -5,7 +5,7 @@
 #ifndef BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_
 #define BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 
diff --git a/brightray/browser/win/scoped_hstring.h b/brightray/browser/win/scoped_hstring.h
index 5494df2fc5ce..67e4fe67fd07 100644
--- a/brightray/browser/win/scoped_hstring.h
+++ b/brightray/browser/win/scoped_hstring.h
@@ -10,7 +10,7 @@
 #include <hstring.h>
 #include <windows.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 class ScopedHString {
  public: