summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-22 22:36:42 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-23 06:37:37 +0000
commit2d124c0ce773bd5dd334e2c6168cbb66a4b224d6 (patch)
treef677b902e1a77a269af4761c9a270f0ddabb6e5e /extensions/shell
parentbf2f7bc27f6baa44286fea07e39540c3ac8db77d (diff)
downloadchromium_src-2d124c0ce773bd5dd334e2c6168cbb66a4b224d6.zip
chromium_src-2d124c0ce773bd5dd334e2c6168cbb66a4b224d6.tar.gz
chromium_src-2d124c0ce773bd5dd334e2c6168cbb66a4b224d6.tar.bz2
Switch to standard integer types in extensions/.
BUG=138542 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/1543053002 Cr-Commit-Position: refs/heads/master@{#366716}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/app/shell_main.cc1
-rw-r--r--extensions/shell/app/shell_main_delegate.cc1
-rw-r--r--extensions/shell/app/shell_main_delegate.h2
-rw-r--r--extensions/shell/browser/default_shell_browser_main_delegate.cc1
-rw-r--r--extensions/shell/browser/shell_app_delegate.h3
-rw-r--r--extensions/shell/browser/shell_app_view_guest_delegate.h1
-rw-r--r--extensions/shell/browser/shell_audio_controller_chromeos.h2
-rw-r--r--extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc6
-rw-r--r--extensions/shell/browser/shell_browser_main_parts.cc1
-rw-r--r--extensions/shell/browser/shell_browser_main_parts.h3
-rw-r--r--extensions/shell/browser/shell_content_browser_client.cc3
-rw-r--r--extensions/shell/browser/shell_content_browser_client.h1
-rw-r--r--extensions/shell/browser/shell_desktop_controller_aura.cc2
-rw-r--r--extensions/shell/browser/shell_desktop_controller_aura.h3
-rw-r--r--extensions/shell/browser/shell_desktop_controller_aura_unittest.cc1
-rw-r--r--extensions/shell/browser/shell_display_info_provider.h1
-rw-r--r--extensions/shell/browser/shell_extension_system.h1
-rw-r--r--extensions/shell/browser/shell_extension_system_factory.h1
-rw-r--r--extensions/shell/browser/shell_extension_web_contents_observer.h1
-rw-r--r--extensions/shell/browser/shell_extensions_browser_client.cc1
-rw-r--r--extensions/shell/browser/shell_extensions_browser_client.h2
-rw-r--r--extensions/shell/browser/shell_nacl_browser_delegate.cc1
-rw-r--r--extensions/shell/browser/shell_native_app_window.h1
-rw-r--r--extensions/shell/browser/shell_native_app_window_mac.h1
-rw-r--r--extensions/shell/browser/shell_network_delegate.h1
-rw-r--r--extensions/shell/browser/shell_oauth2_token_service_delegate.h1
-rw-r--r--extensions/shell/browser/shell_prefs.cc1
-rw-r--r--extensions/shell/browser/shell_prefs_unittest.cc2
-rw-r--r--extensions/shell/browser/shell_runtime_api_delegate.cc1
-rw-r--r--extensions/shell/browser/shell_speech_recognition_manager_delegate.h1
-rw-r--r--extensions/shell/browser/shell_update_query_params_delegate.h1
-rw-r--r--extensions/shell/browser/shell_url_request_context_getter.h1
-rw-r--r--extensions/shell/common/shell_extensions_client.cc1
-rw-r--r--extensions/shell/common/shell_extensions_client.h2
-rw-r--r--extensions/shell/test/shell_apitest.h1
-rw-r--r--extensions/shell/test/shell_test.cc1
36 files changed, 49 insertions, 6 deletions
diff --git a/extensions/shell/app/shell_main.cc b/extensions/shell/app/shell_main.cc
index f3aac10..30cd856 100644
--- a/extensions/shell/app/shell_main.cc
+++ b/extensions/shell/app/shell_main.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 "content/public/app/content_main.h"
#include "extensions/shell/app/shell_main_delegate.h"
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc
index fb762e9..d275927 100644
--- a/extensions/shell/app/shell_main_delegate.cc
+++ b/extensions/shell/app/shell_main_delegate.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "build/build_config.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/common/content_switches.h"
#include "extensions/common/extension_paths.h"
diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h
index 4a616df..335307a 100644
--- a/extensions/shell/app/shell_main_delegate.h
+++ b/extensions/shell/app/shell_main_delegate.h
@@ -6,8 +6,10 @@
#define EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
+#include "build/build_config.h"
#include "content/public/app/content_main_delegate.h"
namespace content {
diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc
index bbd237f..c73a35f 100644
--- a/extensions/shell/browser/default_shell_browser_main_delegate.cc
+++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/strings/string_tokenizer.h"
+#include "build/build_config.h"
#include "extensions/common/switches.h"
#include "extensions/shell/browser/shell_extension_system.h"
diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h
index 410329e..22b3ec0 100644
--- a/extensions/shell/browser/shell_app_delegate.h
+++ b/extensions/shell/browser/shell_app_delegate.h
@@ -5,8 +5,9 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_
-#include "extensions/browser/app_window/app_delegate.h"
+#include "base/macros.h"
#include "content/public/browser/web_contents_observer.h"
+#include "extensions/browser/app_window/app_delegate.h"
namespace extensions {
diff --git a/extensions/shell/browser/shell_app_view_guest_delegate.h b/extensions/shell/browser/shell_app_view_guest_delegate.h
index ea3e3b6..f74ff6d 100644
--- a/extensions/shell/browser/shell_app_view_guest_delegate.h
+++ b/extensions/shell/browser/shell_app_view_guest_delegate.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_VIEW_GUEST_DELEGATE_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_VIEW_GUEST_DELEGATE_H_
+#include "base/macros.h"
#include "content/public/common/context_menu_params.h"
#include "extensions/browser/guest_view/app_view/app_view_guest_delegate.h"
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h
index e93a66d..c0153df1 100644
--- a/extensions/shell/browser/shell_audio_controller_chromeos.h
+++ b/extensions/shell/browser/shell_audio_controller_chromeos.h
@@ -5,6 +5,8 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_AUDIO_CONTROLLER_CHROMEOS_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_AUDIO_CONTROLLER_CHROMEOS_H_
+#include <stdint.h>
+
#include "base/macros.h"
#include "chromeos/audio/cras_audio_handler.h"
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
index a1563c7..f859a5c 100644
--- a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
+++ b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
@@ -4,6 +4,8 @@
#include "extensions/shell/browser/shell_audio_controller_chromeos.h"
+#include <stdint.h>
+
#include "base/macros.h"
#include "chromeos/audio/audio_device.h"
#include "chromeos/audio/audio_devices_pref_handler.h"
@@ -56,7 +58,7 @@ class ShellAudioControllerTest : public testing::Test {
}
// Changes the active state of the node with |id| in |nodes|.
- void SetNodeActive(AudioNodeList* nodes, uint64 id, bool active) {
+ void SetNodeActive(AudioNodeList* nodes, uint64_t id, bool active) {
for (AudioNodeList::iterator it = nodes->begin();
it != nodes->end(); ++it) {
if (it->id == id) {
@@ -72,7 +74,7 @@ class ShellAudioControllerTest : public testing::Test {
scoped_ptr<ShellAudioController> controller_;
// Next audio node ID to be returned by CreateNode().
- uint64 next_node_id_;
+ uint64_t next_node_id_;
private:
DISALLOW_COPY_AND_ASSIGN(ShellAudioControllerTest);
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 0153679..55aee81 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
+#include "build/build_config.h"
#include "components/devtools_http_handler/devtools_http_handler.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/storage_monitor/storage_monitor.h"
diff --git a/extensions/shell/browser/shell_browser_main_parts.h b/extensions/shell/browser/shell_browser_main_parts.h
index 18665b4..0525cbb 100644
--- a/extensions/shell/browser/shell_browser_main_parts.h
+++ b/extensions/shell/browser/shell_browser_main_parts.h
@@ -5,10 +5,11 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/task/cancelable_task_tracker.h"
+#include "build/build_config.h"
#include "content/public/browser/browser_main_parts.h"
#include "content/public/common/main_function_params.h"
#include "ui/aura/window_tree_host_observer.h"
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index 044f0461..52ebc5b 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -4,9 +4,12 @@
#include "extensions/shell/browser/shell_content_browser_client.h"
+#include <stddef.h>
+
#include <utility>
#include "base/command_line.h"
+#include "base/macros.h"
#include "components/guest_view/browser/guest_view_message_filter.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h
index 16e51ca..8abdc1e 100644
--- a/extensions/shell/browser/shell_content_browser_client.h
+++ b/extensions/shell/browser/shell_content_browser_client.h
@@ -6,6 +6,7 @@
#define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "content/public/browser/content_browser_client.h"
class GURL;
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
index 2cf78ef..9fc1876 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura.cc
@@ -9,6 +9,8 @@
#include <vector>
#include "base/command_line.h"
+#include "base/macros.h"
+#include "build/build_config.h"
#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/native_app_window.h"
#include "extensions/shell/browser/shell_app_delegate.h"
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h
index 17546c1..7459525 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.h
+++ b/extensions/shell/browser/shell_desktop_controller_aura.h
@@ -7,9 +7,10 @@
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
#include "extensions/shell/browser/desktop_controller.h"
#include "ui/aura/client/window_tree_client.h"
#include "ui/aura/window_tree_host_observer.h"
diff --git a/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc b/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc
index fc1c01a..8bcfc4a 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "ui/aura/test/aura_test_base.h"
#if defined(OS_CHROMEOS)
diff --git a/extensions/shell/browser/shell_display_info_provider.h b/extensions/shell/browser/shell_display_info_provider.h
index 52c8576..ceb30fb 100644
--- a/extensions/shell/browser/shell_display_info_provider.h
+++ b/extensions/shell/browser/shell_display_info_provider.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DISPLAY_INFO_PROVIDER_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_DISPLAY_INFO_PROVIDER_H_
+#include "base/macros.h"
#include "extensions/browser/api/system_display/display_info_provider.h"
namespace extensions {
diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h
index ca2cb5e..b84c3fd 100644
--- a/extensions/shell/browser/shell_extension_system.h
+++ b/extensions/shell/browser/shell_extension_system.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/one_shot_event.h"
diff --git a/extensions/shell/browser/shell_extension_system_factory.h b/extensions/shell/browser/shell_extension_system_factory.h
index f78e64a..ef4fbeb 100644
--- a/extensions/shell/browser/shell_extension_system_factory.h
+++ b/extensions/shell/browser/shell_extension_system_factory.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_FACTORY_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_FACTORY_H_
+#include "base/macros.h"
#include "base/memory/singleton.h"
#include "extensions/browser/extension_system_provider.h"
diff --git a/extensions/shell/browser/shell_extension_web_contents_observer.h b/extensions/shell/browser/shell_extension_web_contents_observer.h
index a2a187f..372b7c2 100644
--- a/extensions/shell/browser/shell_extension_web_contents_observer.h
+++ b/extensions/shell/browser/shell_extension_web_contents_observer.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_WEB_CONTENTS_OBSERVER_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_WEB_CONTENTS_OBSERVER_H_
+#include "base/macros.h"
#include "content/public/browser/web_contents_user_data.h"
#include "extensions/browser/extension_web_contents_observer.h"
diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
index fc53b92..c104d1c 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.cc
+++ b/extensions/shell/browser/shell_extensions_browser_client.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "build/build_config.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h
index 8c449ee..da3e8be 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.h
+++ b/extensions/shell/browser/shell_extensions_browser_client.h
@@ -6,6 +6,8 @@
#define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "build/build_config.h"
#include "extensions/browser/extensions_browser_client.h"
class PrefService;
diff --git a/extensions/shell/browser/shell_nacl_browser_delegate.cc b/extensions/shell/browser/shell_nacl_browser_delegate.cc
index 9f2b4bc..88db0fd 100644
--- a/extensions/shell/browser/shell_nacl_browser_delegate.cc
+++ b/extensions/shell/browser/shell_nacl_browser_delegate.cc
@@ -11,6 +11,7 @@
#include "base/path_service.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "build/build_config.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/extensions/shell/browser/shell_native_app_window.h b/extensions/shell/browser/shell_native_app_window.h
index a63248e..775473c 100644
--- a/extensions/shell/browser/shell_native_app_window.h
+++ b/extensions/shell/browser/shell_native_app_window.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_
+#include "base/macros.h"
#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/app_window/native_app_window.h"
diff --git a/extensions/shell/browser/shell_native_app_window_mac.h b/extensions/shell/browser/shell_native_app_window_mac.h
index 0f98923..23b0fe3 100644
--- a/extensions/shell/browser/shell_native_app_window_mac.h
+++ b/extensions/shell/browser/shell_native_app_window_mac.h
@@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
#import "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
#include "extensions/shell/browser/shell_native_app_window.h"
@class ShellNSWindow;
diff --git a/extensions/shell/browser/shell_network_delegate.h b/extensions/shell/browser/shell_network_delegate.h
index 7eef370..8dc76fa 100644
--- a/extensions/shell/browser/shell_network_delegate.h
+++ b/extensions/shell/browser/shell_network_delegate.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NETNETWORK_DELEGATE_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_NETNETWORK_DELEGATE_H_
+#include "base/macros.h"
#include "extensions/browser/info_map.h"
#include "net/base/network_delegate_impl.h"
diff --git a/extensions/shell/browser/shell_oauth2_token_service_delegate.h b/extensions/shell/browser/shell_oauth2_token_service_delegate.h
index d9add4a..2537092 100644
--- a/extensions/shell/browser/shell_oauth2_token_service_delegate.h
+++ b/extensions/shell/browser/shell_oauth2_token_service_delegate.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "content/public/browser/browser_context.h"
#include "google_apis/gaia/oauth2_access_token_fetcher_impl.h"
#include "google_apis/gaia/oauth2_token_service_delegate.h"
diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc
index 5c257bd..fdbc656 100644
--- a/extensions/shell/browser/shell_prefs.cc
+++ b/extensions/shell/browser/shell_prefs.cc
@@ -9,6 +9,7 @@
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/pref_service_factory.h"
+#include "build/build_config.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/user_prefs/user_prefs.h"
#include "content/public/browser/browser_context.h"
diff --git a/extensions/shell/browser/shell_prefs_unittest.cc b/extensions/shell/browser/shell_prefs_unittest.cc
index 4fe55d0..740c0ef 100644
--- a/extensions/shell/browser/shell_prefs_unittest.cc
+++ b/extensions/shell/browser/shell_prefs_unittest.cc
@@ -4,8 +4,10 @@
#include "extensions/shell/browser/shell_prefs.h"
+#include "base/macros.h"
#include "base/path_service.h"
#include "base/prefs/pref_service.h"
+#include "build/build_config.h"
#include "components/user_prefs/user_prefs.h"
#include "content/public/test/test_browser_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
diff --git a/extensions/shell/browser/shell_runtime_api_delegate.cc b/extensions/shell/browser/shell_runtime_api_delegate.cc
index 77dacab..1d0a06f 100644
--- a/extensions/shell/browser/shell_runtime_api_delegate.cc
+++ b/extensions/shell/browser/shell_runtime_api_delegate.cc
@@ -4,6 +4,7 @@
#include "extensions/shell/browser/shell_runtime_api_delegate.h"
+#include "build/build_config.h"
#include "extensions/common/api/runtime.h"
#if defined(OS_CHROMEOS)
diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h
index 3a040b1..5d00dc0 100644
--- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h
+++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h
@@ -5,6 +5,7 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+#include "base/macros.h"
#include "content/public/browser/speech_recognition_event_listener.h"
#include "content/public/browser/speech_recognition_manager_delegate.h"
diff --git a/extensions/shell/browser/shell_update_query_params_delegate.h b/extensions/shell/browser/shell_update_query_params_delegate.h
index 39887e6..90e499b 100644
--- a/extensions/shell/browser/shell_update_query_params_delegate.h
+++ b/extensions/shell/browser/shell_update_query_params_delegate.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "components/update_client/update_query_params_delegate.h"
namespace extensions {
diff --git a/extensions/shell/browser/shell_url_request_context_getter.h b/extensions/shell/browser/shell_url_request_context_getter.h
index 0742530..1b6156a 100644
--- a/extensions/shell/browser/shell_url_request_context_getter.h
+++ b/extensions/shell/browser/shell_url_request_context_getter.h
@@ -6,6 +6,7 @@
#define EXTENSIONS_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "content/shell/browser/shell_url_request_context_getter.h"
namespace base {
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 5153eea..58a2e2f 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -6,6 +6,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "extensions/common/api/generated_schemas.h"
#include "extensions/common/common_manifest_handlers.h"
#include "extensions/common/extension_urls.h"
diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h
index a173185..8c14d06 100644
--- a/extensions/shell/common/shell_extensions_client.h
+++ b/extensions/shell/common/shell_extensions_client.h
@@ -5,8 +5,8 @@
#ifndef EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
#define EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "extensions/common/extensions_client.h"
#include "extensions/common/permissions/extensions_api_permissions.h"
diff --git a/extensions/shell/test/shell_apitest.h b/extensions/shell/test/shell_apitest.h
index 2246b49..b3103e4 100644
--- a/extensions/shell/test/shell_apitest.h
+++ b/extensions/shell/test/shell_apitest.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/macros.h"
#include "extensions/shell/test/shell_test.h"
namespace extensions {
diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc
index 183303a..b1e8cc4 100644
--- a/extensions/shell/test/shell_test.cc
+++ b/extensions/shell/test/shell_test.cc
@@ -9,6 +9,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "build/build_config.h"
#include "content/public/common/content_switches.h"
#include "extensions/browser/extension_system.h"
#include "extensions/shell/browser/desktop_controller.h"