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/net/devtools_network_interceptor.cc b/brightray/browser/net/devtools_network_interceptor.cc
index 78afb00a09a5..2535ed74bd3c 100644
--- a/brightray/browser/net/devtools_network_interceptor.cc
+++ b/brightray/browser/net/devtools_network_interceptor.cc
@@ -207,7 +207,7 @@ void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) {
   base::TimeTicks desired_time =
       offset_ + tick_length_ * (last_tick_ + min_ticks_left);
 
-  int64_t min_baseline = std::numeric_limits<int64>::max();
+  int64_t min_baseline = std::numeric_limits<int64_t>::max();
   for (size_t i = 0; i < suspend_count; ++i) {
     if (suspended_transactions_[i].second < min_baseline)
       min_baseline = suspended_transactions_[i].second;
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:
diff --git a/brightray/browser/win/windows_toast_notification.cc b/brightray/browser/win/windows_toast_notification.cc
index c1be87223cd1..badd4f2254b0 100644
--- a/brightray/browser/win/windows_toast_notification.cc
+++ b/brightray/browser/win/windows_toast_notification.cc
@@ -330,7 +330,7 @@ bool WindowsToastNotification::GetTextNodeList(
     ScopedHString* tag,
     IXmlDocument* doc,
     IXmlNodeList** node_list,
-    UINT32 req_length) {
+    Uint32_t req_length) {
   tag->Reset(L"text");
   if (!tag->success())
     return false;
@@ -338,7 +338,7 @@ bool WindowsToastNotification::GetTextNodeList(
   if (FAILED(doc->GetElementsByTagName(*tag, node_list)))
     return false;
 
-  UINT32 node_length;
+  Uint32_t node_length;
   if (FAILED((*node_list)->get_Length(&node_length)))
     return false;
 
diff --git a/brightray/browser/win/windows_toast_notification.h b/brightray/browser/win/windows_toast_notification.h
index cb69d3da2a14..6cd7bafe876c 100644
--- a/brightray/browser/win/windows_toast_notification.h
+++ b/brightray/browser/win/windows_toast_notification.h
@@ -70,7 +70,7 @@ class WindowsToastNotification : public Notification {
   bool GetTextNodeList(ScopedHString* tag,
                        ABI::Windows::Data::Xml::Dom::IXmlDocument* doc,
                        ABI::Windows::Data::Xml::Dom::IXmlNodeList** nodeList,
-                       UINT32 reqLength);
+                       Uint32_t reqLength);
   bool AppendTextToXml(ABI::Windows::Data::Xml::Dom::IXmlDocument* doc,
                        ABI::Windows::Data::Xml::Dom::IXmlNode* node,
                        const std::wstring& text);