Switch to standard integer types in extensions/browser/.

BUG=138542
TBR=benwells@chromium.org

Review URL: https://codereview.chromium.org/1549643002

Cr-Commit-Position: refs/heads/master@{#366702}

13 files changed, 27 insertions, 10 deletions

diff --git a/extensions/browser/app_window/app_web_contents_helper.h b/extensions/browser/app_window/app_web_contents_helper.h
index 8e45eba5..12d4598 100644
--- a/extensions/browser/app_window/app_web_contents_helper.h
+++ b/extensions/browser/app_window/app_web_contents_helper.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WEB_CONTENTS_HELPER_H_
 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WEB_CONTENTS_HELPER_H_
 
+#include "base/macros.h"
 #include "content/public/common/media_stream_request.h"
 
 namespace blink {
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 98c21f3..75d5d40 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/browser/app_window/app_window.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 #include <utility>
@@ -16,6 +18,7 @@
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/invalidate_type.h"
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index 0654073..59d8463 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -5,10 +5,13 @@
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/sessions/core/session_id.h"
@@ -58,7 +61,7 @@ class AppWindowContents {
                           const GURL& url) = 0;
 
   // Called to load the contents, after the app window is created.
-  virtual void LoadContents(int32 creator_process_id) = 0;
+  virtual void LoadContents(int32_t creator_process_id) = 0;
 
   // Called when the native window changes.
   virtual void NativeWindowChanged(NativeAppWindow* native_app_window) = 0;
@@ -164,7 +167,7 @@ class AppWindow : public content::WebContentsDelegate,
     std::string window_key;
 
     // The process ID of the process that requested the create.
-    int32 creator_process_id;
+    int32_t creator_process_id;
 
     // Initial state of the window.
     ui::WindowShowState state;
diff --git a/extensions/browser/app_window/app_window_browsertest.cc b/extensions/browser/app_window/app_window_browsertest.cc
index 784c9b1..396c882 100644
--- a/extensions/browser/app_window/app_window_browsertest.cc
+++ b/extensions/browser/app_window/app_window_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "extensions/browser/app_window/native_app_window.h"
 
diff --git a/extensions/browser/app_window/app_window_client.cc b/extensions/browser/app_window/app_window_client.cc
index df9baea..4b71b96 100644
--- a/extensions/browser/app_window/app_window_client.cc
+++ b/extensions/browser/app_window/app_window_client.cc
@@ -4,7 +4,6 @@
 
 #include "extensions/browser/app_window/app_window_client.h"
 
-#include "base/basictypes.h"
 
 namespace extensions {
 
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc
index 0362998..3419326 100644
--- a/extensions/browser/app_window/app_window_contents.cc
+++ b/extensions/browser/app_window/app_window_contents.cc
@@ -40,7 +40,7 @@ void AppWindowContentsImpl::Initialize(content::BrowserContext* context,
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
-void AppWindowContentsImpl::LoadContents(int32 creator_process_id) {
+void AppWindowContentsImpl::LoadContents(int32_t creator_process_id) {
   // If the new view is in the same process as the creator, block the created
   // RVH from loading anything until the background page has had a chance to
   // do any initialization it wants. If it's a different process, the new RVH
diff --git a/extensions/browser/app_window/app_window_contents.h b/extensions/browser/app_window/app_window_contents.h
index 559bd92..37a4027 100644
--- a/extensions/browser/app_window/app_window_contents.h
+++ b/extensions/browser/app_window/app_window_contents.h
@@ -5,7 +5,9 @@
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_
 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/app_window/app_window.h"
@@ -31,7 +33,7 @@ class AppWindowContentsImpl : public AppWindowContents,
 
   // AppWindowContents
   void Initialize(content::BrowserContext* context, const GURL& url) override;
-  void LoadContents(int32 creator_process_id) override;
+  void LoadContents(int32_t creator_process_id) override;
   void NativeWindowChanged(NativeAppWindow* native_app_window) override;
   void NativeWindowClosed() override;
   void DispatchWindowShownForTests() const override;
diff --git a/extensions/browser/app_window/app_window_geometry_cache.cc b/extensions/browser/app_window/app_window_geometry_cache.cc
index 1413ce7..adc8631 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/browser/app_window/app_window_geometry_cache.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
@@ -246,7 +248,7 @@ void AppWindowGeometryCache::LoadGeometryFromStorage(
         }
         std::string ts_as_string;
         if (stored_window->GetString("ts", &ts_as_string)) {
-          int64 ts;
+          int64_t ts;
           if (base::StringToInt64(ts_as_string, &ts)) {
             window_data.last_change = base::Time::FromInternalValue(ts);
           }
diff --git a/extensions/browser/app_window/app_window_geometry_cache.h b/extensions/browser/app_window/app_window_geometry_cache.h
index ac6e931..1fbdb73 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.h
+++ b/extensions/browser/app_window/app_window_geometry_cache.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_GEOMETRY_CACHE_H_
 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_GEOMETRY_CACHE_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 #include <string>
diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
index 9aef229..edf1467 100644
--- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/browser/app_window/app_window_geometry_cache.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/files/file_path.h"
diff --git a/extensions/browser/app_window/app_window_interactive_uitest.cc b/extensions/browser/app_window/app_window_interactive_uitest.cc
index 8de07ab..496bf32 100644
--- a/extensions/browser/app_window/app_window_interactive_uitest.cc
+++ b/extensions/browser/app_window/app_window_interactive_uitest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "extensions/browser/app_window/native_app_window.h"
 
diff --git a/extensions/browser/app_window/test_app_window_contents.cc b/extensions/browser/app_window/test_app_window_contents.cc
index 6cdefcb..8d3f227 100644
--- a/extensions/browser/app_window/test_app_window_contents.cc
+++ b/extensions/browser/app_window/test_app_window_contents.cc
@@ -19,8 +19,7 @@ void TestAppWindowContents::Initialize(content::BrowserContext* context,
                                        const GURL& url) {
 }
 
-void TestAppWindowContents::LoadContents(int32 creator_process_id) {
-}
+void TestAppWindowContents::LoadContents(int32_t creator_process_id) {}
 
 void TestAppWindowContents::NativeWindowChanged(
     NativeAppWindow* native_app_window) {
diff --git a/extensions/browser/app_window/test_app_window_contents.h b/extensions/browser/app_window/test_app_window_contents.h
index 97635aa..f93b682 100644
--- a/extensions/browser/app_window/test_app_window_contents.h
+++ b/extensions/browser/app_window/test_app_window_contents.h
@@ -5,6 +5,8 @@
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_TEST_APP_WINDOW_CONTENTS_
 #define EXTENSIONS_BROWSER_APP_WINDOW_TEST_APP_WINDOW_CONTENTS_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "extensions/browser/app_window/app_window.h"
 
@@ -23,7 +25,7 @@ class TestAppWindowContents : public AppWindowContents {
 
   // apps:AppWindowContents:
   void Initialize(content::BrowserContext* context, const GURL& url) override;
-  void LoadContents(int32 creator_process_id) override;
+  void LoadContents(int32_t creator_process_id) override;
   void NativeWindowChanged(NativeAppWindow* native_app_window) override;
   void NativeWindowClosed() override;
   void DispatchWindowShownForTests() const override;