[LSC] Add #include <string> to prepare for removal of base::string16

This change adds #include <string> to files currently including
"base/strings/string16.h". This prepares these files for the planned
removal of the base::string16 alias.

In order to adhere to the style guide [1] the following logic was
performed:

* Insert into an existing block of C++ STL includes, if possible
* Else insert `#include <string>` followed by a newline before the first
  #include "some_header.h" line that is not referring to a matching header
  (only relevant for implementation and test files)

[1] https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

Bug: 1184339
Change-Id: I96660fec3fff0192d53e9728bbbae86228a52c58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2749296
Commit-Queue: Jan Wilken Dörrie <[email protected]>
Owners-Override: Jan Wilken Dörrie <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/master@{#861966}
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h
index 77241c9..820591d 100644
--- a/chrome/browser/android/bookmarks/bookmark_bridge.h
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <set>
+#include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
index 6aa0040..9eb1842 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/i18n/case_conversion.h"
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index e1920e3..79e25cf 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/android/history_report/delta_file_commons.h b/chrome/browser/android/history_report/delta_file_commons.h
index 9b58173..8275782886 100644
--- a/chrome/browser/android/history_report/delta_file_commons.h
+++ b/chrome/browser/android/history_report/delta_file_commons.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/android/proto/delta_file.pb.h"
 #include "components/history/core/browser/history_types.h"
diff --git a/chrome/browser/android/intent_helper.h b/chrome/browser/android/intent_helper.h
index 35c5df2b..dc30d78 100644
--- a/chrome/browser/android/intent_helper.h
+++ b/chrome/browser/android/intent_helper.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace chrome {
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index 2d9b0bf7..3bb7186b 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/android/jni_android.h"
diff --git a/chrome/browser/android/omnibox/omnibox_prerender.h b/chrome/browser/android/omnibox/omnibox_prerender.h
index fa4f7e0..8feaaa3 100644
--- a/chrome/browser/android/omnibox/omnibox_prerender.h
+++ b/chrome/browser/android/omnibox/omnibox_prerender.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ANDROID_OMNIBOX_OMNIBOX_PRERENDER_H_
 
 #include <memory>
+#include <string>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/macros.h"
diff --git a/chrome/browser/android/password_edit_delegate.h b/chrome/browser/android/password_edit_delegate.h
index 0433535..9b7ee38 100644
--- a/chrome/browser/android/password_edit_delegate.h
+++ b/chrome/browser/android/password_edit_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_PASSWORD_EDIT_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_PASSWORD_EDIT_DELEGATE_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/android/search_permissions/search_permissions_service.h b/chrome/browser/android/search_permissions/search_permissions_service.h
index 94c824e..dfc97fe 100644
--- a/chrome/browser/android/search_permissions/search_permissions_service.h
+++ b/chrome/browser/android/search_permissions/search_permissions_service.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ANDROID_SEARCH_PERMISSIONS_SEARCH_PERMISSIONS_SERVICE_H_
 #define CHROME_BROWSER_ANDROID_SEARCH_PERMISSIONS_SEARCH_PERMISSIONS_SERVICE_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 0f8b6cdb..1a2bb70 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 #include <limits>
+#include <string>
 #include <utility>
 
 #include "base/android/jni_android.h"
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index e7326098..66e3a3e 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
diff --git a/chrome/browser/android/vr/autocomplete_controller.cc b/chrome/browser/android/vr/autocomplete_controller.cc
index b8afda7..f4f0eb1 100644
--- a/chrome/browser/android/vr/autocomplete_controller.cc
+++ b/chrome/browser/android/vr/autocomplete_controller.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/android/vr/autocomplete_controller.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/android/vr/gvr_input_delegate.cc b/chrome/browser/android/vr/gvr_input_delegate.cc
index 4947a082a..4e8c6e4 100644
--- a/chrome/browser/android/vr/gvr_input_delegate.cc
+++ b/chrome/browser/android/vr/gvr_input_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/vr/gvr_input_delegate.h"
 
+#include <string>
 #include <utility>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/android/vr/vr_gl_thread.cc b/chrome/browser/android/vr/vr_gl_thread.cc
index 5e6361c2..4c1ebfc8 100644
--- a/chrome/browser/android/vr/vr_gl_thread.cc
+++ b/chrome/browser/android/vr/vr_gl_thread.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/vr/vr_gl_thread.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/android/vr/vr_shell.h b/chrome/browser/android/vr/vr_shell.h
index b107310..68cdb815 100644
--- a/chrome/browser/android/vr/vr_shell.h
+++ b/chrome/browser/android/vr/vr_shell.h
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include <memory>
+#include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
index f9867bb..b8944695 100644
--- a/chrome/browser/android/webapk/webapk_installer.cc
+++ b/chrome/browser/android/webapk/webapk_installer.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/webapk/webapk_installer.h"
 
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
index b0ccb9e..e784e3a 100644
--- a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
+++ b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/android/build_info.h"
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
index 42f9571..e9b58072 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -4,6 +4,7 @@
 
 #include <jni.h>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 5e82b5f..c2358c04 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -10,6 +10,8 @@
 #import <objc/runtime.h>
 #include <stddef.h>
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/apps/app_service/extension_apps_base.cc b/chrome/browser/apps/app_service/extension_apps_base.cc
index c963ae9b..5246526 100644
--- a/chrome/browser/apps/app_service/extension_apps_base.cc
+++ b/chrome/browser/apps/app_service/extension_apps_base.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/apps/app_service/extension_apps.h"
 
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/apps/app_service/web_apps_chromeos.cc b/chrome/browser/apps/app_service/web_apps_chromeos.cc
index fe2899f..a63eafd7 100644
--- a/chrome/browser/apps/app_service/web_apps_chromeos.cc
+++ b/chrome/browser/apps/app_service/web_apps_chromeos.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/apps/app_service/web_apps_chromeos.h"
 
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/apps/platform_apps/shortcut_manager.cc b/chrome/browser/apps/platform_apps/shortcut_manager.cc
index 81648a1..13f3888 100644
--- a/chrome/browser/apps/platform_apps/shortcut_manager.cc
+++ b/chrome/browser/apps/platform_apps/shortcut_manager.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/ash/certificate_provider/security_token_pin_dialog_host_popup_impl.cc b/chrome/browser/ash/certificate_provider/security_token_pin_dialog_host_popup_impl.cc
index a3e579b72..947012f 100644
--- a/chrome/browser/ash/certificate_provider/security_token_pin_dialog_host_popup_impl.cc
+++ b/chrome/browser/ash/certificate_provider/security_token_pin_dialog_host_popup_impl.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ash/certificate_provider/security_token_pin_dialog_host_popup_impl.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_screenlock_state_handler.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_screenlock_state_handler.cc
index bd2f5a34..eedb516 100644
--- a/chrome/browser/ash/login/easy_unlock/easy_unlock_screenlock_state_handler.cc
+++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_screenlock_state_handler.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/saml/password_expiry_notification.cc b/chrome/browser/ash/login/saml/password_expiry_notification.cc
index 83307e7..167f4601 100644
--- a/chrome/browser/ash/login/saml/password_expiry_notification.cc
+++ b/chrome/browser/ash/login/saml/password_expiry_notification.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ash/login/saml/password_expiry_notification.h"
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "ash/public/cpp/notification_utils.h"
diff --git a/chrome/browser/ash/login/saml/password_expiry_notification.h b/chrome/browser/ash/login/saml/password_expiry_notification.h
index 95f833d..ecddb2c 100644
--- a/chrome/browser/ash/login/saml/password_expiry_notification.h
+++ b/chrome/browser/ash/login/saml/password_expiry_notification.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ASH_LOGIN_SAML_PASSWORD_EXPIRY_NOTIFICATION_H_
 #define CHROME_BROWSER_ASH_LOGIN_SAML_PASSWORD_EXPIRY_NOTIFICATION_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 
diff --git a/chrome/browser/ash/login/signin/signin_error_notifier_ash.cc b/chrome/browser/ash/login/signin/signin_error_notifier_ash.cc
index a33159243..757cd6c 100644
--- a/chrome/browser/ash/login/signin/signin_error_notifier_ash.cc
+++ b/chrome/browser/ash/login/signin/signin_error_notifier_ash.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ash/login/signin/signin_error_notifier_ash.h"
 
 #include <memory>
+#include <string>
 
 #include "ash/components/account_manager/account_manager_factory.h"
 #include "ash/public/cpp/notification_utils.h"
diff --git a/chrome/browser/ash/login/ui/web_contents_forced_title.h b/chrome/browser/ash/login/ui/web_contents_forced_title.h
index fb72a97..4149dcbe 100644
--- a/chrome/browser/ash/login/ui/web_contents_forced_title.h
+++ b/chrome/browser/ash/login/ui/web_contents_forced_title.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_ASH_LOGIN_UI_WEB_CONTENTS_FORCED_TITLE_H_
 #define CHROME_BROWSER_ASH_LOGIN_UI_WEB_CONTENTS_FORCED_TITLE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/ash/notifications/deprecation_notification_controller.cc b/chrome/browser/ash/notifications/deprecation_notification_controller.cc
index 1e4d1c6c..094646be 100644
--- a/chrome/browser/ash/notifications/deprecation_notification_controller.cc
+++ b/chrome/browser/ash/notifications/deprecation_notification_controller.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ash/notifications/deprecation_notification_controller.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller_impl.h"
diff --git a/chrome/browser/ash/system/timezone_util.h b/chrome/browser/ash/system/timezone_util.h
index 28a014c2..38844b6 100644
--- a/chrome/browser/ash/system/timezone_util.h
+++ b/chrome/browser/ash/system/timezone_util.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_ASH_SYSTEM_TIMEZONE_UTIL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 // TODO(https://crbug.com/1164001): move TimeZoneResponseData to forward
diff --git a/chrome/browser/ash/web_applications/crosh_system_web_app_info.cc b/chrome/browser/ash/web_applications/crosh_system_web_app_info.cc
index 48ca82b..5ff57884 100644
--- a/chrome/browser/ash/web_applications/crosh_system_web_app_info.cc
+++ b/chrome/browser/ash/web_applications/crosh_system_web_app_info.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ash/web_applications/crosh_system_web_app_info.h"
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/web_applications/file_manager_web_app_info.cc b/chrome/browser/ash/web_applications/file_manager_web_app_info.cc
index 3d71704..2bbfcda7 100644
--- a/chrome/browser/ash/web_applications/file_manager_web_app_info.cc
+++ b/chrome/browser/ash/web_applications/file_manager_web_app_info.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ash/web_applications/file_manager_web_app_info.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
diff --git a/chrome/browser/ash/web_applications/media_web_app_info.cc b/chrome/browser/ash/web_applications/media_web_app_info.cc
index eb3c6f6..c200323 100644
--- a/chrome/browser/ash/web_applications/media_web_app_info.cc
+++ b/chrome/browser/ash/web_applications/media_web_app_info.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ash/web_applications/media_web_app_info.h"
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
diff --git a/chrome/browser/autofill/manual_filling_view_interface.h b/chrome/browser/autofill/manual_filling_view_interface.h
index 10f8435..a45b6ce 100644
--- a/chrome/browser/autofill/manual_filling_view_interface.h
+++ b/chrome/browser/autofill/manual_filling_view_interface.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_AUTOFILL_MANUAL_FILLING_VIEW_INTERFACE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/banners/android/chrome_app_banner_manager_android.cc b/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
index a4e32be4..f9c8cf2f 100644
--- a/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
+++ b/chrome/browser/banners/android/chrome_app_banner_manager_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/banners/android/chrome_app_banner_manager_android.h"
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc
index 310cc60..e461ca3a 100644
--- a/chrome/browser/banners/app_banner_manager_browsertest.cc
+++ b/chrome/browser/banners/app_banner_manager_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 <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc
index 807eeac..6a5904d 100644
--- a/chrome/browser/banners/app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
diff --git a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
index 3a8b36df4..31ca38f 100644
--- a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
+++ b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/callback.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 3d258c24..542e602e 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -7,6 +7,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <string>
+
 #include "base/containers/flat_set.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/time_formatting.h"
diff --git a/chrome/browser/browser_switcher/bho/mini_bho_util_unittest.cc b/chrome/browser/browser_switcher/bho/mini_bho_util_unittest.cc
index f63962d..d162d390 100644
--- a/chrome/browser/browser_switcher/bho/mini_bho_util_unittest.cc
+++ b/chrome/browser/browser_switcher/bho/mini_bho_util_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <string.h>
 
+#include <string>
+
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.h b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.h
index 08582bd..ea14281 100644
--- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.h
+++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_COUNTERS_BROWSING_DATA_COUNTER_UTILS_H_
 #define CHROME_BROWSER_BROWSING_DATA_COUNTERS_BROWSING_DATA_COUNTER_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/counters/browsing_data_counter.h"
diff --git a/chrome/browser/chooser_controller/chooser_controller.h b/chrome/browser/chooser_controller/chooser_controller.h
index c0c18f8..d9efd3d 100644
--- a/chrome/browser/chooser_controller/chooser_controller.h
+++ b/chrome/browser/chooser_controller/chooser_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHOOSER_CONTROLLER_CHOOSER_CONTROLLER_H_
 #define CHROME_BROWSER_CHOOSER_CONTROLLER_CHOOSER_CONTROLLER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/chooser_controller/fake_usb_chooser_controller.h b/chrome/browser/chooser_controller/fake_usb_chooser_controller.h
index 5b7e92c..bd0dd058 100644
--- a/chrome/browser/chooser_controller/fake_usb_chooser_controller.h
+++ b/chrome/browser/chooser_controller/fake_usb_chooser_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHOOSER_CONTROLLER_FAKE_USB_CHOOSER_CONTROLLER_H_
 #define CHROME_BROWSER_CHOOSER_CONTROLLER_FAKE_USB_CHOOSER_CONTROLLER_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.h b/chrome/browser/chromeos/attestation/platform_verification_dialog.h
index df3bce7d..1cfb8b6 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_dialog.h
+++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_DIALOG_H_
 #define CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_DIALOG_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.cc b/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.cc
index 6801424..7e43cdbb 100644
--- a/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.cc
+++ b/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h"
 
+#include <string>
 #include <tuple>
 #include <utility>
 
diff --git a/chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.cc b/chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.cc
index 8a765fd..a58e7d6 100644
--- a/chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.cc
+++ b/chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
diff --git a/chrome/browser/chromeos/child_accounts/time_limits/web_time_navigation_observer.h b/chrome/browser/chromeos/child_accounts/time_limits/web_time_navigation_observer.h
index 724863e..3e2200f1 100644
--- a/chrome/browser/chromeos/child_accounts/time_limits/web_time_navigation_observer.h
+++ b/chrome/browser/chromeos/child_accounts/time_limits/web_time_navigation_observer.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_TIME_LIMITS_WEB_TIME_NAVIGATION_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_TIME_LIMITS_WEB_TIME_NAVIGATION_OBSERVER_H_
 
+#include <string>
+
 #include "base/observer_list_types.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/crostini/crostini_installer.cc b/chrome/browser/chromeos/crostini/crostini_installer.cc
index 795e72c..e09c373180 100644
--- a/chrome/browser/chromeos/crostini/crostini_installer.cc
+++ b/chrome/browser/chromeos/crostini/crostini_installer.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/crostini/crostini_installer.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/chromeos/crostini/crostini_installer_ui_delegate.h b/chrome/browser/chromeos/crostini/crostini_installer_ui_delegate.h
index e444446..bb54db8a 100644
--- a/chrome/browser/chromeos/crostini/crostini_installer_ui_delegate.h
+++ b/chrome/browser/chromeos/crostini/crostini_installer_ui_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_INSTALLER_UI_DELEGATE_H_
 #define CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_INSTALLER_UI_DELEGATE_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/crostini/crostini_manager.h"
diff --git a/chrome/browser/chromeos/crostini/crostini_upgrader_ui_delegate.h b/chrome/browser/chromeos/crostini/crostini_upgrader_ui_delegate.h
index 4f22694..aff8dd9 100644
--- a/chrome/browser/chromeos/crostini/crostini_upgrader_ui_delegate.h
+++ b/chrome/browser/chromeos/crostini/crostini_upgrader_ui_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_UPGRADER_UI_DELEGATE_H_
 #define CHROME_BROWSER_CHROMEOS_CROSTINI_CROSTINI_UPGRADER_UI_DELEGATE_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader.mojom.h"
diff --git a/chrome/browser/chromeos/eol_notification.h b/chrome/browser/chromeos/eol_notification.h
index b7169bd..c937eec2 100644
--- a/chrome/browser/chromeos/eol_notification.h
+++ b/chrome/browser/chromeos/eol_notification.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_EOL_NOTIFICATION_H_
 #define CHROME_BROWSER_CHROMEOS_EOL_NOTIFICATION_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc b/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc
index ef9afedc..9036d0a0 100644
--- a/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc
+++ b/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/exo/chrome_data_exchange_delegate.h"
 
+#include <string>
+
 #include "ash/public/cpp/app_types.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/chromeos/input_method/assistive_window_properties.h b/chrome/browser/chromeos/input_method/assistive_window_properties.h
index 6af1234..0f26b42 100644
--- a/chrome/browser/chromeos/input_method/assistive_window_properties.h
+++ b/chrome/browser/chromeos/input_method/assistive_window_properties.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ASSISTIVE_WINDOW_PROPERTIES_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ASSISTIVE_WINDOW_PROPERTIES_H_
 
+#include <string>
 #include <vector>
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/input_method/ui/assistive_delegate.h"
diff --git a/chrome/browser/chromeos/input_method/grammar_service_client.h b/chrome/browser/chromeos/input_method/grammar_service_client.h
index 5b655c7..fbf9b66 100644
--- a/chrome/browser/chromeos/input_method/grammar_service_client.h
+++ b/chrome/browser/chromeos/input_method/grammar_service_client.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_GRAMMAR_SERVICE_CLIENT_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_GRAMMAR_SERVICE_CLIENT_H_
 
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/input_method/ui/assistive_delegate.h b/chrome/browser/chromeos/input_method/ui/assistive_delegate.h
index bd2229d..c6c1354 100644
--- a/chrome/browser/chromeos/input_method/ui/assistive_delegate.h
+++ b/chrome/browser/chromeos/input_method/ui/assistive_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_UI_ASSISTIVE_DELEGATE_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_UI_ASSISTIVE_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/chromeos/ui_chromeos_export.h"
 
diff --git a/chrome/browser/chromeos/input_method/ui/suggestion_details.h b/chrome/browser/chromeos/input_method/ui/suggestion_details.h
index c778ba2..9d3ed6b 100644
--- a/chrome/browser/chromeos/input_method/ui/suggestion_details.h
+++ b/chrome/browser/chromeos/input_method/ui/suggestion_details.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_UI_SUGGESTION_DETAILS_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_UI_SUGGESTION_DETAILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace ui {
diff --git a/chrome/browser/chromeos/kerberos/kerberos_ticket_expiry_notification.cc b/chrome/browser/chromeos/kerberos/kerberos_ticket_expiry_notification.cc
index 97a4e96..f46dc74 100644
--- a/chrome/browser/chromeos/kerberos/kerberos_ticket_expiry_notification.cc
+++ b/chrome/browser/chromeos/kerberos/kerberos_ticket_expiry_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/kerberos/kerberos_ticket_expiry_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/chromeos/lock_screen_apps/app_manager_impl.cc b/chrome/browser/chromeos/lock_screen_apps/app_manager_impl.cc
index 39f211c..51f5e18 100644
--- a/chrome/browser/chromeos/lock_screen_apps/app_manager_impl.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/app_manager_impl.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/lock_screen_apps/app_manager_impl.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "apps/launcher.h"
diff --git a/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc b/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc
index 1abebce..3de50cd 100644
--- a/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/chromeos/lock_screen_apps/state_controller.cc b/chrome/browser/chromeos/lock_screen_apps/state_controller.cc
index 3956f3c..0732402 100644
--- a/chrome/browser/chromeos/lock_screen_apps/state_controller.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/state_controller.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
 
+#include <string>
 #include <utility>
 
 #include "ash/public/ash_interfaces.h"
diff --git a/chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.h b/chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.h
index 4e6af36..c9aa8c27 100644
--- a/chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.h
+++ b/chrome/browser/chromeos/lock_screen_apps/toast_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_LOCK_SCREEN_APPS_TOAST_DIALOG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_LOCK_SCREEN_APPS_TOAST_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/night_light/night_light_client.h b/chrome/browser/chromeos/night_light/night_light_client.h
index a90602d..2267fb7b 100644
--- a/chrome/browser/chromeos/night_light/night_light_client.h
+++ b/chrome/browser/chromeos/night_light/night_light_client.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_NIGHT_LIGHT_NIGHT_LIGHT_CLIENT_H_
 
 #include <memory>
+#include <string>
 
 #include "ash/public/cpp/night_light_controller.h"
 #include "base/macros.h"
diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_uninstaller_notification.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_uninstaller_notification.cc
index fe98604..cf9f8f7 100644
--- a/chrome/browser/chromeos/plugin_vm/plugin_vm_uninstaller_notification.cc
+++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_uninstaller_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/plugin_vm/plugin_vm_uninstaller_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h
index f78a2f0..ab832b6 100644
--- a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h
+++ b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DLP_CLIPBOARD_BUBBLE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DLP_CLIPBOARD_BUBBLE_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h
index d348a96..b18d8cd 100644
--- a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h
+++ b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DLP_DATA_TRANSFER_DLP_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DLP_DATA_TRANSFER_DLP_CONTROLLER_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.h"
diff --git a/chrome/browser/chromeos/policy/system_proxy_manager.cc b/chrome/browser/chromeos/policy/system_proxy_manager.cc
index a40f6dc..47d9b768 100644
--- a/chrome/browser/chromeos/policy/system_proxy_manager.cc
+++ b/chrome/browser/chromeos/policy/system_proxy_manager.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/policy/system_proxy_manager.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/containers/contains.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/set_time_dialog.cc b/chrome/browser/chromeos/set_time_dialog.cc
index 323a7916..08b0c47 100644
--- a/chrome/browser/chromeos/set_time_dialog.cc
+++ b/chrome/browser/chromeos/set_time_dialog.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/set_time_dialog.h"
 
+#include <string>
+
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string16.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/tpm_firmware_update_notification.cc b/chrome/browser/chromeos/tpm_firmware_update_notification.cc
index b692cb6..30fb6d9 100644
--- a/chrome/browser/chromeos/tpm_firmware_update_notification.cc
+++ b/chrome/browser/chromeos/tpm_firmware_update_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/tpm_firmware_update_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/macros.h"
diff --git a/chrome/browser/chromeos/u2f_notification.cc b/chrome/browser/chromeos/u2f_notification.cc
index 30135b3..e0f4c6e 100644
--- a/chrome/browser/chromeos/u2f_notification.cc
+++ b/chrome/browser/chromeos/u2f_notification.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/u2f_notification.h"
 
 #include <memory>
+#include <string>
 
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
diff --git a/chrome/browser/chromeos/ui/adb_sideloading_policy_change_notification.cc b/chrome/browser/chromeos/ui/adb_sideloading_policy_change_notification.cc
index 2b8d1d0..2831be4c 100644
--- a/chrome/browser/chromeos/ui/adb_sideloading_policy_change_notification.cc
+++ b/chrome/browser/chromeos/ui/adb_sideloading_policy_change_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/ui/adb_sideloading_policy_change_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/gnubby_notification.cc b/chrome/browser/chromeos/ui/gnubby_notification.cc
index 8072d86..205036c 100644
--- a/chrome/browser/chromeos/ui/gnubby_notification.cc
+++ b/chrome/browser/chromeos/ui/gnubby_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/ui/gnubby_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.h b/chrome/browser/chromeos/ui/idle_app_name_notification_view.h
index ee677093..15100e3 100644
--- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.h
+++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_UI_IDLE_APP_NAME_NOTIFICATION_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/kiosk_external_update_notification.h b/chrome/browser/chromeos/ui/kiosk_external_update_notification.h
index fdbda44..51b8dc6 100644
--- a/chrome/browser/chromeos/ui/kiosk_external_update_notification.h
+++ b/chrome/browser/chromeos/ui/kiosk_external_update_notification.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_UI_KIOSK_EXTERNAL_UPDATE_NOTIFICATION_H_
 #define CHROME_BROWSER_CHROMEOS_UI_KIOSK_EXTERNAL_UPDATE_NOTIFICATION_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/chromeos/ui/system_proxy_notification.cc b/chrome/browser/chromeos/ui/system_proxy_notification.cc
index bd2a602..3f60c8a 100644
--- a/chrome/browser/chromeos/ui/system_proxy_notification.cc
+++ b/chrome/browser/chromeos/ui/system_proxy_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/ui/system_proxy_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/tpm_auto_update_notification.cc b/chrome/browser/chromeos/ui/tpm_auto_update_notification.cc
index 6c4a2888..56b3c53 100644
--- a/chrome/browser/chromeos/ui/tpm_auto_update_notification.cc
+++ b/chrome/browser/chromeos/ui/tpm_auto_update_notification.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/ui/tpm_auto_update_notification.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/update_required_notification.h b/chrome/browser/chromeos/ui/update_required_notification.h
index be4158d..b8ac407 100644
--- a/chrome/browser/chromeos/ui/update_required_notification.h
+++ b/chrome/browser/chromeos/ui/update_required_notification.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_UI_UPDATE_REQUIRED_NOTIFICATION_H_
 #define CHROME_BROWSER_CHROMEOS_UI_UPDATE_REQUIRED_NOTIFICATION_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
diff --git a/chrome/browser/continuous_search/internal/search_url_helper.h b/chrome/browser/continuous_search/internal/search_url_helper.h
index 7eec6aa..788de24fee 100644
--- a/chrome/browser/continuous_search/internal/search_url_helper.h
+++ b/chrome/browser/continuous_search/internal/search_url_helper.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_CONTINUOUS_SEARCH_INTERNAL_SEARCH_URL_HELPER_H_
 #define CHROME_BROWSER_CONTINUOUS_SEARCH_INTERNAL_SEARCH_URL_HELPER_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/continuous_search/internal/search_result_category.h"
diff --git a/chrome/browser/continuous_search/internal/search_url_helper_unittest.cc b/chrome/browser/continuous_search/internal/search_url_helper_unittest.cc
index 10f27264..468bb6f 100644
--- a/chrome/browser/continuous_search/internal/search_url_helper_unittest.cc
+++ b/chrome/browser/continuous_search/internal/search_url_helper_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/continuous_search/internal/search_url_helper.h"
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h b/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
index 4afb1eb2..e4257b5 100644
--- a/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
+++ b/chrome/browser/data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DATA_REDUCTION_PROXY_DATA_REDUCTION_PROMO_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <memory>
+#include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
diff --git a/chrome/browser/devtools/devtools_infobar_delegate.h b/chrome/browser/devtools/devtools_infobar_delegate.h
index c92c359..f421e2a 100644
--- a/chrome/browser/devtools/devtools_infobar_delegate.h
+++ b/chrome/browser/devtools/devtools_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/devtools/devtools_toggle_action.h b/chrome/browser/devtools/devtools_toggle_action.h
index c6a3a4e..d9021b5 100644
--- a/chrome/browser/devtools/devtools_toggle_action.h
+++ b/chrome/browser/devtools/devtools_toggle_action.h
@@ -8,6 +8,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/download/download_commands.h b/chrome/browser/download/download_commands.h
index 41528e6..3b9f03f3 100644
--- a/chrome/browser/download/download_commands.h
+++ b/chrome/browser/download/download_commands.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMMANDS_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMMANDS_H_
 
+#include <string>
+
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index d5c18e3..56b6f8122 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/download/download_item_model.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index 94d47af..513bd64 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc
index 32db13e..f03312b 100644
--- a/chrome/browser/download/download_item_model_unittest.cc
+++ b/chrome/browser/download/download_item_model_unittest.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <string>
 #include <vector>
 
 #include "base/check_op.h"
diff --git a/chrome/browser/download/download_shelf_context_menu.h b/chrome/browser/download/download_shelf_context_menu.h
index e421245b7..0f6bc41 100644
--- a/chrome/browser/download/download_shelf_context_menu.h
+++ b/chrome/browser/download/download_shelf_context_menu.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
index 039511f..59dfc29 100644
--- a/chrome/browser/download/download_ui_model.h
+++ b/chrome/browser/download/download_ui_model.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
index ba3ef81..f333628 100644
--- a/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/enterprise/reporting/browser_report_generator_desktop.h"
 
 #include <memory>
+#include <string>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/enterprise/reporting/profile_report_generator_unittest.cc b/chrome/browser/enterprise/reporting/profile_report_generator_unittest.cc
index ceb5544f..8136c304 100644
--- a/chrome/browser/enterprise/reporting/profile_report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/profile_report_generator_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "components/enterprise/browser/reporting/profile_report_generator.h"
 
+#include <string>
+
 #include "base/json/json_reader.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/enterprise/reporting/report_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
index 525a612..b20c886 100644
--- a/chrome/browser/enterprise/reporting/report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
@@ -5,6 +5,7 @@
 #include "components/enterprise/browser/reporting/report_generator.h"
 
 #include <set>
+#include <string>
 
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
index 38e5a02..0b766b6 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 15f6ad4b..d014a74 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -8,6 +8,7 @@
 
 #include <limits>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
index 8acf3137..8ac4eaa 100644
--- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
+++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/api/file_system/chrome_file_system_delegate.h"
 
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/extensions/api/file_system/file_entry_picker.cc b/chrome/browser/extensions/api/file_system/file_entry_picker.cc
index 5f1f256..abad0a6c 100644
--- a/chrome/browser/extensions/api/file_system/file_entry_picker.cc
+++ b/chrome/browser/extensions/api/file_system/file_entry_picker.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/api/file_system/file_entry_picker.h"
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
diff --git a/chrome/browser/extensions/api/file_system/request_file_system_notification.cc b/chrome/browser/extensions/api/file_system/request_file_system_notification.cc
index 287985a..4ea51d3 100644
--- a/chrome/browser/extensions/api/file_system/request_file_system_notification.cc
+++ b/chrome/browser/extensions/api/file_system/request_file_system_notification.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/api/file_system/request_file_system_notification.h"
 
+#include <string>
 #include <utility>
 
 #include "base/callback.h"
diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc
index b720b71..d17cf37a 100644
--- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc
+++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/check_op.h"
 #include "base/lazy_instance.h"
diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h b/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h
index 2630f0f..d4f1f434 100644
--- a/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h
+++ b/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MESSAGING_INCOGNITO_CONNECTABILITY_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_INCOGNITO_CONNECTABILITY_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
index 78e53631..bc45ae77 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
@@ -7,6 +7,8 @@
 #include <windows.h>
 #include <stdint.h>
 
+#include <string>
+
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index da8e7b9..38c8eb3 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
index 050730d..8962c65 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/format_macros.h"
+
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
index 65ceb1e..2f50724 100644
--- a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
+++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
@@ -10,6 +10,7 @@
 #include <iterator>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
index 0e641929..17d4bbf 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <memory>
 #include <sstream>
+#include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/extensions/api/passwords_private/test_passwords_private_delegate.cc b/chrome/browser/extensions/api/passwords_private/test_passwords_private_delegate.cc
index 3abc5b82..85fcc4d1 100644
--- a/chrome/browser/extensions/api/passwords_private/test_passwords_private_delegate.cc
+++ b/chrome/browser/extensions/api/passwords_private/test_passwords_private_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/extensions/api/passwords_private/test_passwords_private_delegate.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
index 8e56210..8fcf959 100644
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
@@ -5,6 +5,7 @@
 
 #include <memory>
 #include <set>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/tab_groups/tab_groups_api.cc b/chrome/browser/extensions/api/tab_groups/tab_groups_api.cc
index 2a624978..44fedb4 100644
--- a/chrome/browser/extensions/api/tab_groups/tab_groups_api.cc
+++ b/chrome/browser/extensions/api/tab_groups/tab_groups_api.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/api/tab_groups/tab_groups_api.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index c48d961..01ab5b5e 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <limits>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.h b/chrome/browser/extensions/chrome_extension_web_contents_observer.h
index 5bfc113a..527ae33c6 100644
--- a/chrome/browser/extensions/chrome_extension_web_contents_observer.h
+++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
index cf9667bd..0a4289f 100644
--- a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
+++ b/chrome/browser/extensions/corb_and_cors_extension_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 <string>
 #include <vector>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc
index 0422f94..7528606 100644
--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/extension_error_ui.h b/chrome/browser/extensions/extension_error_ui.h
index 4a8437d..cb8fe34 100644
--- a/chrome/browser/extensions/extension_error_ui.h
+++ b/chrome/browser/extensions/extension_error_ui.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_UI_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_UI_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index a4ac226..24fb070d 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/extension_management.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.h b/chrome/browser/extensions/extension_uninstall_dialog.h
index 89e35561..311228d1 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.h
+++ b/chrome/browser/extensions/extension_uninstall_dialog.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_UNINSTALL_DIALOG_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index eb611f8..81a05a1f 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/external_provider_impl.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/extensions/forced_extensions/install_stage_tracker.h b/chrome/browser/extensions/forced_extensions/install_stage_tracker.h
index ab085931..f809622 100644
--- a/chrome/browser/extensions/forced_extensions/install_stage_tracker.h
+++ b/chrome/browser/extensions/forced_extensions/install_stage_tracker.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_FORCED_EXTENSIONS_INSTALL_STAGE_TRACKER_H_
 
 #include <map>
+#include <string>
 #include <utility>
 
 #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/install_prompt_permissions.cc b/chrome/browser/extensions/install_prompt_permissions.cc
index 7db780e63..6192485 100644
--- a/chrome/browser/extensions/install_prompt_permissions.cc
+++ b/chrome/browser/extensions/install_prompt_permissions.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 <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/install_prompt_permissions.h b/chrome/browser/extensions/install_prompt_permissions.h
index cad9bb9..7f4c65a 100644
--- a/chrome/browser/extensions/install_prompt_permissions.h
+++ b/chrome/browser/extensions/install_prompt_permissions.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_PROMPT_PERMISSIONS_H_
 #define CHROME_BROWSER_EXTENSIONS_INSTALL_PROMPT_PERMISSIONS_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/permissions_based_management_policy_provider.cc b/chrome/browser/extensions/permissions_based_management_policy_provider.cc
index 0dc1a7e..449c630 100644
--- a/chrome/browser/extensions/permissions_based_management_policy_provider.cc
+++ b/chrome/browser/extensions/permissions_based_management_policy_provider.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/extensions/permissions_based_management_policy_provider.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_management.h"
diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc
index cd4a827c..4fa5153 100644
--- a/chrome/browser/extensions/shared_module_service_unittest.cc
+++ b/chrome/browser/extensions/shared_module_service_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/shared_module_service.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 5bce9aa5..1ace444 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/unpacked_installer.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
index c73221a8..0d6af31d 100644
--- a/chrome/browser/favicon/content_favicon_driver_browsertest.cc
+++ b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
@@ -5,6 +5,7 @@
 #include "components/favicon/content/content_favicon_driver.h"
 
 #include <set>
+#include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/font_family_cache.h b/chrome/browser/font_family_cache.h
index 3e15bc5..15e7c97 100644
--- a/chrome/browser/font_family_cache.h
+++ b/chrome/browser/font_family_cache.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_FONT_FAMILY_CACHE_H_
 #define CHROME_BROWSER_FONT_FAMILY_CACHE_H_
 
+#include <string>
 #include <unordered_map>
 
 #include "base/gtest_prod_util.h"
diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc
index b96b408..fbd6402 100644
--- a/chrome/browser/history/redirect_browsertest.cc
+++ b/chrome/browser/history/redirect_browsertest.cc
@@ -8,6 +8,7 @@
 // the case of redirects. It may also mean problems with the history system.
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc
index f0fdde7..4b3031ad 100644
--- a/chrome/browser/importer/edge_importer_browsertest_win.cc
+++ b/chrome/browser/importer/edge_importer_browsertest_win.cc
@@ -4,6 +4,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/files/file_util.h"
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index eaee427..13135f5b 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -15,6 +15,7 @@
 #include <wrl/client.h>
 
 #include <algorithm>
+#include <string>
 #include <vector>
 
 #include "base/bind.h"
diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h
index 0dc12eb..6219d45 100644
--- a/chrome/browser/importer/profile_writer.h
+++ b/chrome/browser/importer/profile_writer.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/installable/installable_manager_browsertest.cc b/chrome/browser/installable/installable_manager_browsertest.cc
index 974b99a..c556a70 100644
--- a/chrome/browser/installable/installable_manager_browsertest.cc
+++ b/chrome/browser/installable/installable_manager_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "components/webapps/browser/installable/installable_manager.h"
 
+#include <string>
 #include <tuple>
 
 #include "base/bind.h"
diff --git a/chrome/browser/mac/keystone_glue.h b/chrome/browser/mac/keystone_glue.h
index 5decd73..6cf3d80 100644
--- a/chrome/browser/mac/keystone_glue.h
+++ b/chrome/browser/mac/keystone_glue.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 #if defined(__OBJC__)
diff --git a/chrome/browser/media/feeds/media_feeds_converter.cc b/chrome/browser/media/feeds/media_feeds_converter.cc
index 0211657..81db366 100644
--- a/chrome/browser/media/feeds/media_feeds_converter.cc
+++ b/chrome/browser/media/feeds/media_feeds_converter.cc
@@ -6,6 +6,7 @@
 
 #include <cmath>
 #include <numeric>
+#include <string>
 #include <vector>
 
 #include "base/containers/flat_set.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
index cf7deb67..56c3329 100644
--- a/chrome/browser/media/webrtc/desktop_media_list.h
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_H_
 #define CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.h b/chrome/browser/media_galleries/media_galleries_dialog_controller.h
index b7f2368..883aec16 100644
--- a/chrome/browser/media_galleries/media_galleries_dialog_controller.h
+++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
index a0930fc..469e104 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/media_galleries/media_galleries_permission_controller.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc
index f003f9c..11e70bd3 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/base_paths_posix.h"
diff --git a/chrome/browser/media_galleries/win/mtp_device_object_entry.h b/chrome/browser/media_galleries/win/mtp_device_object_entry.h
index 3ffd901..9f80ee3 100644
--- a/chrome/browser/media_galleries/win/mtp_device_object_entry.h
+++ b/chrome/browser/media_galleries/win/mtp_device_object_entry.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc
index d81acd2..44851f80 100644
--- a/chrome/browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc
@@ -10,6 +10,7 @@
 #include <stdint.h>
 
 #include <ctime>
+#include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 8b1753d4..70f05e2 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/metrics/plugin_metrics_provider.h b/chrome/browser/metrics/plugin_metrics_provider.h
index 0a3aa1c..dbd66cc 100644
--- a/chrome/browser/metrics/plugin_metrics_provider.h
+++ b/chrome/browser/metrics/plugin_metrics_provider.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_METRICS_PLUGIN_METRICS_PROVIDER_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc
index 7776507..ab0b8b2 100644
--- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc
+++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/nearby_sharing/nearby_notification_manager.cc b/chrome/browser/nearby_sharing/nearby_notification_manager.cc
index dd75261..de96d9a 100644
--- a/chrome/browser/nearby_sharing/nearby_notification_manager.cc
+++ b/chrome/browser/nearby_sharing/nearby_notification_manager.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/nearby_sharing/nearby_notification_manager.h"
 
+#include <string>
+
 #include "ash/public/cpp/ash_features.h"
 #include "base/files/file_util.h"
 #include "base/notreached.h"
diff --git a/chrome/browser/net/net_error_diagnostics_dialog_win.cc b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
index 7e0b653..3365d71d 100644
--- a/chrome/browser/net/net_error_diagnostics_dialog_win.cc
+++ b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
@@ -10,6 +10,7 @@
 #include <windows.h>   // NOLINT
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/notifications/notification_alert_service_bridge_unittest.mm b/chrome/browser/notifications/notification_alert_service_bridge_unittest.mm
index eb5fb077..3c3efce0 100644
--- a/chrome/browser/notifications/notification_alert_service_bridge_unittest.mm
+++ b/chrome/browser/notifications/notification_alert_service_bridge_unittest.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/notifications/notification_display_service_impl.h b/chrome/browser/notifications/notification_display_service_impl.h
index 1f432d2..0830f278 100644
--- a/chrome/browser/notifications/notification_display_service_impl.h
+++ b/chrome/browser/notifications/notification_display_service_impl.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_IMPL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/containers/queue.h"
diff --git a/chrome/browser/notifications/notification_display_service_tester.h b/chrome/browser/notifications/notification_display_service_tester.h
index 738bd8f..dcb1b2e 100644
--- a/chrome/browser/notifications/notification_display_service_tester.h
+++ b/chrome/browser/notifications/notification_display_service_tester.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_TESTER_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_TESTER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_lacros_unittest.cc b/chrome/browser/notifications/notification_platform_bridge_lacros_unittest.cc
index 00a9e30a..1693f3cb 100644
--- a/chrome/browser/notifications/notification_platform_bridge_lacros_unittest.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_lacros_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/notifications/notification_platform_bridge_lacros.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/notification_platform_bridge_delegate.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac_utils.h b/chrome/browser/notifications/notification_platform_bridge_mac_utils.h
index dcb8cec..3f40414 100644
--- a/chrome/browser/notifications/notification_platform_bridge_mac_utils.h
+++ b/chrome/browser/notifications/notification_platform_bridge_mac_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_PLATFORM_BRIDGE_MAC_UTILS_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_PLATFORM_BRIDGE_MAC_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "ui/message_center/public/cpp/notification.h"
diff --git a/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc b/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc
index e30f493e..da59b18 100644
--- a/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc
+++ b/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc
@@ -15,6 +15,7 @@
 // to make notification_helper_unittests.exe have data dependency on chrome.exe.
 
 #include <memory>
+#include <string>
 
 #include <NotificationActivationCallback.h>
 #include <wrl/client.h>
diff --git a/chrome/browser/obsolete_system/obsolete_system.h b/chrome/browser/obsolete_system/obsolete_system.h
index 2abc413..322af072 100644
--- a/chrome/browser/obsolete_system/obsolete_system.h
+++ b/chrome/browser/obsolete_system/obsolete_system.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_OBSOLETE_SYSTEM_OBSOLETE_SYSTEM_H_
 #define CHROME_BROWSER_OBSOLETE_SYSTEM_OBSOLETE_SYSTEM_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc
index b2fa2810..9c14e19a 100644
--- a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc
+++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/offline_pages/offline_page_mhtml_archiver.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/offline_pages/offline_page_utils_unittest.cc
index 902abe1..4f07b879 100644
--- a/chrome/browser/offline_pages/offline_page_utils_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_utils_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/offline_pages/offline_page_utils.h"
 
 #include <stdint.h>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/offline_pages/prefetch/notifications/prefetch_notification_service.h b/chrome/browser/offline_pages/prefetch/notifications/prefetch_notification_service.h
index b3ca70d5..b7b4649 100644
--- a/chrome/browser/offline_pages/prefetch/notifications/prefetch_notification_service.h
+++ b/chrome/browser/offline_pages/prefetch/notifications/prefetch_notification_service.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_OFFLINE_PAGES_PREFETCH_NOTIFICATIONS_PREFETCH_NOTIFICATION_SERVICE_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
diff --git a/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier.h b/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier.h
index a1582c8..a3e3f169 100644
--- a/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier.h
+++ b/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_OFFLINE_PAGES_PREFETCH_PREFETCHED_PAGES_NOTIFIER_H_
 #define CHROME_BROWSER_OFFLINE_PAGES_PREFETCH_PREFETCHED_PAGES_NOTIFIER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/offline_pages/core/offline_page_types.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc b/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc
index ddddaa0..be001137 100644
--- a/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc
+++ b/chrome/browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/offline_pages/prefetch/prefetched_pages_notifier.h"
 
+#include <string>
+
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
index 0b3c4e4..5932306 100644
--- a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
+++ b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/offline_pages/recent_tab_helper.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/optimization_guide/page_text_observer_browsertest.cc b/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
index ed4dfc5d..43c2455 100644
--- a/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
+++ b/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "components/optimization_guide/content/browser/page_text_observer.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/optional.h"
diff --git a/chrome/browser/password_manager/android/auto_signin_prompt_controller.h b/chrome/browser/password_manager/android/auto_signin_prompt_controller.h
index d4da6b51..5f27363 100644
--- a/chrome/browser/password_manager/android/auto_signin_prompt_controller.h
+++ b/chrome/browser/password_manager/android/auto_signin_prompt_controller.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace content {
diff --git a/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc b/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
index 0762fd36..27d37d34 100644
--- a/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
+++ b/chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/password_manager/android/credential_leak_controller_android.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h b/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
index 300d9ea..9604170c 100644
--- a/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_GENERATED_PASSWORD_SAVED_INFOBAR_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_GENERATED_PASSWORD_SAVED_INFOBAR_DELEGATE_ANDROID_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/infobars/core/infobar_delegate.h"
diff --git a/chrome/browser/password_manager/android/password_accessory_controller.h b/chrome/browser/password_manager/android/password_accessory_controller.h
index 4355609..7af1892 100644
--- a/chrome/browser/password_manager/android/password_accessory_controller.h
+++ b/chrome/browser/password_manager/android/password_accessory_controller.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/callback_forward.h"
diff --git a/chrome/browser/password_manager/android/password_generation_dialog_view_interface.h b/chrome/browser/password_manager/android/password_generation_dialog_view_interface.h
index f7e7a29..bc5dbba 100644
--- a/chrome/browser/password_manager/android/password_generation_dialog_view_interface.h
+++ b/chrome/browser/password_manager/android/password_generation_dialog_view_interface.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_GENERATION_DIALOG_VIEW_INTERFACE_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_GENERATION_DIALOG_VIEW_INTERFACE_H_
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/common/password_generation_util.h"
diff --git a/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h b/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
index da1d06f..bccc2198 100644
--- a/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
+++ b/chrome/browser/password_manager/android/update_password_infobar_delegate_android.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_UPDATE_PASSWORD_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc b/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
index 61859a5..7e428d7 100644
--- a/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
+++ b/chrome/browser/password_manager/android/update_password_infobar_delegate_android_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/password_manager/android/update_password_infobar_delegate_android.h"
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/password_manager/password_store_utils.h b/chrome/browser/password_manager/password_store_utils.h
index 167c98b5..07905730 100644
--- a/chrome/browser/password_manager/password_store_utils.h
+++ b/chrome/browser/password_manager/password_store_utils.h
@@ -7,6 +7,8 @@
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_UTILS_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_UTILS_H_
 
+#include <string>
+
 #include "base/containers/span.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/optional.h"
diff --git a/chrome/browser/payments/secure_payment_confirmation_browsertest.cc b/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
index 4fc53ea3..f6df01c 100644
--- a/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
+++ b/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
@@ -5,6 +5,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win_unittest.cc b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win_unittest.cc
index eb8f6e4..7f543c91 100644
--- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win_unittest.cc
+++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_win_unittest.cc
@@ -9,6 +9,7 @@
 #include <psapi.h>
 
 #include <cstring>
+#include <string>
 #include <vector>
 
 #include "base/command_line.h"
diff --git a/chrome/browser/plugins/hung_plugin_infobar_delegate.h b/chrome/browser/plugins/hung_plugin_infobar_delegate.h
index e693313..8c7d5fd 100644
--- a/chrome/browser/plugins/hung_plugin_infobar_delegate.h
+++ b/chrome/browser/plugins/hung_plugin_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PLUGINS_HUNG_PLUGIN_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_PLUGINS_HUNG_PLUGIN_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc
index 6bf21aa..37e6ed3 100644
--- a/chrome/browser/plugins/plugin_finder.cc
+++ b/chrome/browser/plugins/plugin_finder.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/optional.h"
diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h
index 9e2b780..da3f9fd 100644
--- a/chrome/browser/plugins/plugin_installer.h
+++ b/chrome/browser/plugins/plugin_installer.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
 
+#include <string>
+
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
diff --git a/chrome/browser/plugins/reload_plugin_infobar_delegate.h b/chrome/browser/plugins/reload_plugin_infobar_delegate.h
index 933b9fb..ac48ee3f 100644
--- a/chrome/browser/plugins/reload_plugin_infobar_delegate.h
+++ b/chrome/browser/plugins/reload_plugin_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PLUGINS_RELOAD_PLUGIN_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_PLUGINS_RELOAD_PLUGIN_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 
diff --git a/chrome/browser/policy/browser_dm_token_storage_win.cc b/chrome/browser/policy/browser_dm_token_storage_win.cc
index 6b58681d..dbce4d68 100644
--- a/chrome/browser/policy/browser_dm_token_storage_win.cc
+++ b/chrome/browser/policy/browser_dm_token_storage_win.cc
@@ -15,6 +15,7 @@
 #include <wrl/client.h>
 
 #include <memory>
+#include <string>
 #include <tuple>
 #include <utility>
 #include <vector>
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc
index 8149cc2..abbc995a 100644
--- a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc
+++ b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc b/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc
index 5c4e9537..1c05ade5 100644
--- a/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc
+++ b/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/policy/chrome_extension_policy_migrator.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/policy/locale_policy_browsertest.cc b/chrome/browser/policy/locale_policy_browsertest.cc
index d3a1c49..128977c 100644
--- a/chrome/browser/policy/locale_policy_browsertest.cc
+++ b/chrome/browser/policy/locale_policy_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
diff --git a/chrome/browser/policy/login_policy_test_base_browsertest.cc b/chrome/browser/policy/login_policy_test_base_browsertest.cc
index 9e4fb088..0a56ca5e 100644
--- a/chrome/browser/policy/login_policy_test_base_browsertest.cc
+++ b/chrome/browser/policy/login_policy_test_base_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 <string>
 #include <vector>
 
 #include "ash/constants/ash_pref_names.h"
diff --git a/chrome/browser/policy/url_blacklist_policy_browsertest.cc b/chrome/browser/policy/url_blacklist_policy_browsertest.cc
index cc23c67e..d8af8a99 100644
--- a/chrome/browser/policy/url_blacklist_policy_browsertest.cc
+++ b/chrome/browser/policy/url_blacklist_policy_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/portal/portal_browsertest.cc b/chrome/browser/portal/portal_browsertest.cc
index 4a4a2154..075eb66 100644
--- a/chrome/browser/portal/portal_browsertest.cc
+++ b/chrome/browser/portal/portal_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h
index 43db80a1..32cbfed 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor.h
+++ b/chrome/browser/predictors/autocomplete_action_predictor.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <string>
 #include <tuple>
 #include <utility>
 #include <vector>
diff --git a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
index 6a4e799c..4974dbe 100644
--- a/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
+++ b/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h
index bf2ba4fe..33413e1 100644
--- a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h
+++ b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_PREFETCH_SEARCH_PREFETCH_SEARCH_PREFETCH_SERVICE_H_
 
 #include <map>
+#include <string>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc
index 7071cb9..427df959 100644
--- a/chrome/browser/printing/print_job_unittest.cc
+++ b/chrome/browser/printing/print_job_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/printing/print_job.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index 9310394..1ff738e 100644
--- a/chrome/browser/printing/print_view_manager_base.h
+++ b/chrome/browser/printing/print_view_manager_base.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
diff --git a/chrome/browser/privacy/secure_dns_bridge.cc b/chrome/browser/privacy/secure_dns_bridge.cc
index 977ec3f..40134d14 100644
--- a/chrome/browser/privacy/secure_dns_bridge.cc
+++ b/chrome/browser/privacy/secure_dns_bridge.cc
@@ -4,6 +4,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc
index cf5607f..91133c2 100644
--- a/chrome/browser/process_singleton_win_unittest.cc
+++ b/chrome/browser/process_singleton_win_unittest.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/check.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h
index d3f600d..d0dcf295 100644
--- a/chrome/browser/profile_resetter/profile_resetter.h
+++ b/chrome/browser/profile_resetter/profile_resetter.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter.h b/chrome/browser/profile_resetter/triggered_profile_resetter.h
index 93e4b7c..f4b0049d 100644
--- a/chrome/browser/profile_resetter/triggered_profile_resetter.h
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter.h
@@ -7,6 +7,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
diff --git a/chrome/browser/profiles/profile_info_cache_observer.h b/chrome/browser/profiles/profile_info_cache_observer.h
index a4263446..5b1bddd2 100644
--- a/chrome/browser/profiles/profile_info_cache_observer.h
+++ b/chrome/browser/profiles/profile_info_cache_observer.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/browser/profiles/profile_info_interface.h b/chrome/browser/profiles/profile_info_interface.h
index 5091899..37650ea6 100644
--- a/chrome/browser/profiles/profile_info_interface.h
+++ b/chrome/browser/profiles/profile_info_interface.h
@@ -7,6 +7,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/profiles/profile_shortcut_manager.h b/chrome/browser/profiles/profile_shortcut_manager.h
index 59996b9..a7a44100 100644
--- a/chrome/browser/profiles/profile_shortcut_manager.h
+++ b/chrome/browser/profiles/profile_shortcut_manager.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index cc484b2..9c2e8377 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -4,6 +4,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
diff --git a/chrome/browser/reading_list/android/reading_list_notification_delegate.h b/chrome/browser/reading_list/android/reading_list_notification_delegate.h
index b3a8cfc..751eb4c 100644
--- a/chrome/browser/reading_list/android/reading_list_notification_delegate.h
+++ b/chrome/browser/reading_list/android/reading_list_notification_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_READING_LIST_ANDROID_READING_LIST_NOTIFICATION_DELEGATE_H_
 #define CHROME_BROWSER_READING_LIST_ANDROID_READING_LIST_NOTIFICATION_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 class ReadingListNotificationDelegate {
diff --git a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
index aae79da..09f591c 100644
--- a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h b/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
index 3cb10dd..99fc7d75 100644
--- a/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/mock_render_view_context_menu.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
index 524f68b..1a61e49 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h
index 8b4b76a..ce02d73 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/reputation/safety_tip_ui_helper.h b/chrome/browser/reputation/safety_tip_ui_helper.h
index c76cc16f..18cc206 100644
--- a/chrome/browser/reputation/safety_tip_ui_helper.h
+++ b/chrome/browser/reputation/safety_tip_ui_helper.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_REPUTATION_SAFETY_TIP_UI_HELPER_H_
 #define CHROME_BROWSER_REPUTATION_SAFETY_TIP_UI_HELPER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/reputation/safety_tip_ui.h"
 #include "components/security_state/core/security_state.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit.h b/chrome/browser/resource_coordinator/lifecycle_unit.h
index 087199e..04dcda49 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_RESOURCE_COORDINATOR_LIFECYCLE_UNIT_H_
 
 #include <stdint.h>
+#include <string>
 #include <vector>
 
 #include "base/containers/flat_set.h"
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker.h b/chrome/browser/resource_coordinator/tab_load_tracker.h
index 7dc1cd8..14e7c62 100644
--- a/chrome/browser/resource_coordinator/tab_load_tracker.h
+++ b/chrome/browser/resource_coordinator/tab_load_tracker.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_TAB_LOAD_TRACKER_H_
 #define CHROME_BROWSER_RESOURCE_COORDINATOR_TAB_LOAD_TRACKER_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/containers/flat_map.h"
 #include "base/gtest_prod_util.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager.cc b/chrome/browser/resource_coordinator/tab_manager.cc
index b26b6e3..63a00b6b 100644
--- a/chrome/browser/resource_coordinator/tab_manager.cc
+++ b/chrome/browser/resource_coordinator/tab_manager.cc
@@ -8,6 +8,7 @@
 
 #include <algorithm>
 #include <set>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager.h b/chrome/browser/resource_coordinator/tab_manager.h
index 44ef457..a89db40 100644
--- a/chrome/browser/resource_coordinator/tab_manager.h
+++ b/chrome/browser/resource_coordinator/tab_manager.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc
index f6385260..2268c19 100644
--- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc
+++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "ash/public/cpp/app_types.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_unittest.cc b/chrome/browser/resource_coordinator/tab_manager_unittest.cc
index aca2529c5..f18fb4f 100644
--- a/chrome/browser/resource_coordinator/tab_manager_unittest.cc
+++ b/chrome/browser/resource_coordinator/tab_manager_unittest.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h
index 83546624b..4d43008 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h
+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_PROMPT_ACTIONS_WIN_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_PROMPT_ACTIONS_WIN_H_
 
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h
index 9104aaf..1b4f3c93 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h
+++ b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_MOCK_CHROME_CLEANER_PROCESS_WIN_H_
 
 #include <ostream>
+#include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h
index 81156dd..9aa41a0d 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SAFE_BROWSING_SETTINGS_RESET_PROMPT_SETTINGS_RESET_PROMPT_CONTROLLER_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/sharesheet/share_action.h b/chrome/browser/sharesheet/share_action.h
index fe71dda..318c299 100644
--- a/chrome/browser/sharesheet/share_action.h
+++ b/chrome/browser/sharesheet/share_action.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_SHARESHEET_SHARE_ACTION_H_
 #define CHROME_BROWSER_SHARESHEET_SHARE_ACTION_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/sharesheet/sharesheet_controller.h"
 #include "components/services/app_service/public/mojom/types.mojom.h"
diff --git a/chrome/browser/sharesheet/sharesheet_action_cache.h b/chrome/browser/sharesheet/sharesheet_action_cache.h
index c25193f..748c07a 100644
--- a/chrome/browser/sharesheet/sharesheet_action_cache.h
+++ b/chrome/browser/sharesheet/sharesheet_action_cache.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SHARESHEET_SHARESHEET_ACTION_CACHE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service.h b/chrome/browser/sharesheet/sharesheet_service.h
index e500287..0883c82 100644
--- a/chrome/browser/sharesheet/sharesheet_service.h
+++ b/chrome/browser/sharesheet/sharesheet_service.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SHARESHEET_SHARESHEET_SERVICE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service_delegate.h b/chrome/browser/sharesheet/sharesheet_service_delegate.h
index 164a3a35..dfea0d51 100644
--- a/chrome/browser/sharesheet/sharesheet_service_delegate.h
+++ b/chrome/browser/sharesheet/sharesheet_service_delegate.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SHARESHEET_SHARESHEET_SERVICE_DELEGATE_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/sharesheet/sharesheet_types.h b/chrome/browser/sharesheet/sharesheet_types.h
index 1af57ae..1277a131 100644
--- a/chrome/browser/sharesheet/sharesheet_types.h
+++ b/chrome/browser/sharesheet/sharesheet_types.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_SHARESHEET_SHARESHEET_TYPES_H_
 #define CHROME_BROWSER_SHARESHEET_SHARESHEET_TYPES_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.cc b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.cc
index 54ab732..c8ea39df 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.cc
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h"
 
+#include <string>
+
 #include "base/guid.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils.h b/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils.h
index 15ea8f4..5ad6fda 100644
--- a/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils.h
+++ b/chrome/browser/sharing/shared_clipboard/shared_clipboard_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_UTILS_H_
 #define CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_SHARED_CLIPBOARD_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace content {
diff --git a/chrome/browser/sharing/sharing_dialog_data.h b/chrome/browser/sharing/sharing_dialog_data.h
index 3d2e81a..78ef8de 100644
--- a/chrome/browser/sharing/sharing_dialog_data.h
+++ b/chrome/browser/sharing/sharing_dialog_data.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SHARING_SHARING_DIALOG_DATA_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc
index ae3a045..57b52a4 100644
--- a/chrome/browser/shell_integration_win_unittest.cc
+++ b/chrome/browser/shell_integration_win_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
diff --git a/chrome/browser/signin/dice_signed_in_profile_creator.cc b/chrome/browser/signin/dice_signed_in_profile_creator.cc
index adaf556..71d0dbd 100644
--- a/chrome/browser/signin/dice_signed_in_profile_creator.cc
+++ b/chrome/browser/signin/dice_signed_in_profile_creator.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/signin/dice_signed_in_profile_creator.h"
 
+#include <string>
+
 #include "base/check.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/speech/network_speech_recognizer.cc b/chrome/browser/speech/network_speech_recognizer.cc
index 48a93e7..11a13949 100644
--- a/chrome/browser/speech/network_speech_recognizer.cc
+++ b/chrome/browser/speech/network_speech_recognizer.cc
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <algorithm>
+#include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ssl/ssl_error_controller_client.cc b/chrome/browser/ssl/ssl_error_controller_client.cc
index d57bbb2..617c8eb 100644
--- a/chrome/browser/ssl/ssl_error_controller_client.cc
+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ssl/ssl_error_controller_client.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.h b/chrome/browser/status_icons/desktop_notification_balloon.h
index d5b55009..7f6eecf 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.h
+++ b/chrome/browser/status_icons/desktop_notification_balloon.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_STATUS_ICONS_DESKTOP_NOTIFICATION_BALLOON_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h
index 47127b6..3ee5438 100644
--- a/chrome/browser/status_icons/status_icon.h
+++ b/chrome/browser/status_icons/status_icon.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_STATUS_ICONS_STATUS_ICON_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
diff --git a/chrome/browser/status_icons/status_tray.h b/chrome/browser/status_icons/status_tray.h
index 20f528b..ab9cb09 100644
--- a/chrome/browser/status_icons/status_tray.h
+++ b/chrome/browser/status_icons/status_tray.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_STATUS_ICONS_STATUS_TRAY_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
index 9c16663..9c1e70e 100644
--- a/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_worker_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 <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.cc b/chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.cc
index 9e7443e..d1b96395 100644
--- a/chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.cc
+++ b/chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.h"
 
+#include <string>
+
 #include "base/check.h"
 #include "base/macros.h"
 #include "base/notreached.h"
diff --git a/chrome/browser/task_manager/sampling/task_group_unittest.cc b/chrome/browser/task_manager/sampling/task_group_unittest.cc
index feec8108..ca4e20a 100644
--- a/chrome/browser/task_manager/sampling/task_group_unittest.cc
+++ b/chrome/browser/task_manager/sampling/task_group_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/task_manager/sampling/task_group.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
index 519e9e9..7346e11 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.h b/chrome/browser/task_manager/task_manager_browsertest_util.h
index 1cfaae47..baf460b 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.h
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.h
@@ -13,6 +13,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace task_manager {
diff --git a/chrome/browser/task_manager/task_manager_tester.h b/chrome/browser/task_manager/task_manager_tester.h
index 9624811..8bde017 100644
--- a/chrome/browser/task_manager/task_manager_tester.h
+++ b/chrome/browser/task_manager/task_manager_tester.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/accessibility_util.h b/chrome/browser/ui/accessibility_util.h
index 0061d3e6..66e366a 100644
--- a/chrome/browser/ui/accessibility_util.h
+++ b/chrome/browser/ui/accessibility_util.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_ACCESSIBILITY_UTIL_H_
 #define CHROME_BROWSER_UI_ACCESSIBILITY_UTIL_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 // Announces |message| as an accessibility alert in the currently active normal
diff --git a/chrome/browser/ui/android/autofill/autofill_logger_android.h b/chrome/browser/ui/android/autofill/autofill_logger_android.h
index 59ff5cf7..512842a 100644
--- a/chrome/browser/ui/android/autofill/autofill_logger_android.h
+++ b/chrome/browser/ui/android/autofill/autofill_logger_android.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_LOGGER_ANDROID_H_
 #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_LOGGER_ANDROID_H_
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h b/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h
index 06f54a29..c027559 100644
--- a/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h
+++ b/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h
@@ -7,6 +7,7 @@
 
 #include <jni.h>
 #include <memory>
+#include <string>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
diff --git a/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.h b/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.h
index 623f6351..463ca76 100644
--- a/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.h
+++ b/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h
index 88643d3..f7c37ed 100644
--- a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h
+++ b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc
index 82699bbc..1149965 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.cc
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc
@@ -6,6 +6,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.h b/chrome/browser/ui/android/chrome_http_auth_handler.h
index fa92cf7..0fa05bdc 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.h
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/android/login_handler_android.cc b/chrome/browser/ui/android/login_handler_android.cc
index 8530738..bc0f269 100644
--- a/chrome/browser/ui/android/login_handler_android.cc
+++ b/chrome/browser/ui/android/login_handler_android.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/login/login_handler.h"
 
 #include <memory>
+#include <string>
 
 #include "base/logging.h"
 #include "base/optional.h"
diff --git a/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.cc b/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.cc
index ce21820..29ac186 100644
--- a/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.cc
+++ b/chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/android/passwords/credential_leak_dialog_view_android.h"
 #include <cstdint>
+#include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
diff --git a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.cc b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.cc
index 6bd30f4..77f2f47a 100644
--- a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.cc
+++ b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h"
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
index 60facdcd..92eb888 100644
--- a/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
+++ b/chrome/browser/ui/android/passwords/password_generation_dialog_view_android.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 #include "base/android/scoped_java_ref.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/password_manager/android/password_generation_dialog_view_interface.h"
diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
index b041598..0ceccd4 100644
--- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h"
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
index e050b25..3dace4b 100644
--- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
+++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h
@@ -6,6 +6,8 @@
 #define CHROME_BROWSER_UI_ANDROID_SAFE_BROWSING_PASSWORD_REUSE_DIALOG_VIEW_ANDROID_H_
 
 #include <jni.h>
+#include <string>
+
 #include "base/android/scoped_java_ref.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc
index 72a8fd5..e553866 100644
--- a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc
+++ b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h"
 
 #include <memory>
+#include <string>
 
 #include "ash/public/cpp/app_list/internal_app_id_constants.h"
 #include "ash/public/cpp/keyboard_shortcut_viewer.h"
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_data_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_app_data_search_provider.h
index 7069d53..b973ac8 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_data_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_data_search_provider.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_ARC_ARC_APP_DATA_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_ARC_ARC_APP_DATA_SEARCH_PROVIDER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.cc b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.cc
index 2d39156..8d2eb12 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/app_list/search/arc/arc_app_reinstall_search_provider.h"
 
 #include <algorithm>
+#include <string>
 #include <unordered_set>
 #include <utility>
 
diff --git a/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
index 06503f8..b0f7aeb 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_ARC_ARC_APP_SHORTCUTS_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_ARC_ARC_APP_SHORTCUTS_SEARCH_PROVIDER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/app_list/search/assistant_text_search_provider.cc b/chrome/browser/ui/app_list/search/assistant_text_search_provider.cc
index cafe70aa..603f552 100644
--- a/chrome/browser/ui/app_list/search/assistant_text_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/assistant_text_search_provider.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/app_list/search/assistant_text_search_provider.h"
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "ash/assistant/util/deep_link_util.h"
diff --git a/chrome/browser/ui/app_list/search/assistant_text_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/assistant_text_search_provider_unittest.cc
index d24ddc2..b1b827b 100644
--- a/chrome/browser/ui/app_list/search/assistant_text_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/assistant_text_search_provider_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/app_list/search/assistant_text_search_provider.h"
 
+#include <string>
+
 #include "ash/public/cpp/assistant/test_support/mock_assistant_controller.h"
 #include "ash/public/cpp/assistant/test_support/mock_assistant_state.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/app_list/search/files/drive_zero_state_provider.h b/chrome/browser/ui/app_list/search/files/drive_zero_state_provider.h
index ae47ecf..b91b02e 100644
--- a/chrome/browser/ui/app_list/search/files/drive_zero_state_provider.h
+++ b/chrome/browser/ui/app_list/search/files/drive_zero_state_provider.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_FILES_DRIVE_ZERO_STATE_PROVIDER_H_
 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_FILES_DRIVE_ZERO_STATE_PROVIDER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h
index 9c288041..f9373ffe6 100644
--- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h
+++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/app_list/search/tests/zero_state_file_provider_unittest.cc b/chrome/browser/ui/app_list/search/tests/zero_state_file_provider_unittest.cc
index b49027a..536535ac 100644
--- a/chrome/browser/ui/app_list/search/tests/zero_state_file_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/tests/zero_state_file_provider_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/app_list/search/zero_state_file_provider.h"
 
+#include <string>
+
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/test/test_app_list_color_provider.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/ui/app_list/search/zero_state_file_provider.h b/chrome/browser/ui/app_list/search/zero_state_file_provider.h
index 7dfb815..981441d 100644
--- a/chrome/browser/ui/app_list/search/zero_state_file_provider.h
+++ b/chrome/browser/ui/app_list/search/zero_state_file_provider.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/apps/directory_access_confirmation_dialog.h b/chrome/browser/ui/apps/directory_access_confirmation_dialog.h
index f15d43d..de3b7563 100644
--- a/chrome/browser/ui/apps/directory_access_confirmation_dialog.h
+++ b/chrome/browser/ui/apps/directory_access_confirmation_dialog.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_APPS_DIRECTORY_ACCESS_CONFIRMATION_DIALOG_H_
 #define CHROME_BROWSER_UI_APPS_DIRECTORY_ACCESS_CONFIRMATION_DIALOG_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
index 3355d83..7e81528 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_ASH_HOLDING_SPACE_HOLDING_SPACE_KEYED_SERVICE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "ash/public/cpp/holding_space/holding_space_model.h"
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
index 603ca18..6bfd74e 100644
--- a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
+++ b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "ash/public/cpp/notification_utils.h"
diff --git a/chrome/browser/ui/ash/network/network_state_notifier.cc b/chrome/browser/ui/ash/network/network_state_notifier.cc
index a5e76ab..9fc32e0c 100644
--- a/chrome/browser/ui/ash/network/network_state_notifier.cc
+++ b/chrome/browser/ui/ash/network/network_state_notifier.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/ash/network/network_state_notifier.h"
 
+#include <string>
+
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/chrome/browser/ui/ash/network/tether_notification_presenter.cc b/chrome/browser/ui/ash/network/tether_notification_presenter.cc
index 183f99d2..f835727 100644
--- a/chrome/browser/ui/ash/network/tether_notification_presenter.cc
+++ b/chrome/browser/ui/ash/network/tether_notification_presenter.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/ash/network/tether_notification_presenter.h"
 
+#include <string>
+
 #include "ash/public/cpp/network_icon_image_source.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "base/bind.h"
diff --git a/chrome/browser/ui/ash/security_token_session_restriction_view.cc b/chrome/browser/ui/ash/security_token_session_restriction_view.cc
index 1cd55329..0e8d127 100644
--- a/chrome/browser/ui/ash/security_token_session_restriction_view.cc
+++ b/chrome/browser/ui/ash/security_token_session_restriction_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/ash/security_token_session_restriction_view.h"
 
+#include <string>
+
 #include "base/i18n/message_formatter.h"
 #include "base/strings/string16.h"
 #include "base/time/default_tick_clock.h"
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc
index 29ad6689..cf93f75 100644
--- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc
+++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "ash/public/cpp/ash_typography.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller.h b/chrome/browser/ui/autofill/autofill_popup_controller.h
index d0b9e74..06635be7 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index c633d33..9f13d71e 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/containers/span.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_view.h b/chrome/browser/ui/autofill/autofill_popup_view.h
index e14e08d..8c6e4cf 100644
--- a/chrome/browser/ui/autofill/autofill_popup_view.h
+++ b/chrome/browser/ui/autofill/autofill_popup_view.h
@@ -7,6 +7,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc b/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc
index 1d6e8884..54a3953 100644
--- a/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc
+++ b/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/autofill/payments/autofill_dialog_models.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc b/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc
index 01db487..0740062 100644
--- a/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc
+++ b/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/autofill/payments/credit_card_scanner_controller.h"
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/check.h"
diff --git a/chrome/browser/ui/autofill/payments/credit_card_scanner_view_delegate.h b/chrome/browser/ui/autofill/payments/credit_card_scanner_view_delegate.h
index 8fd684f..ccc7a2f 100644
--- a/chrome/browser/ui/autofill/payments/credit_card_scanner_view_delegate.h
+++ b/chrome/browser/ui/autofill/payments/credit_card_scanner_view_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_CREDIT_CARD_SCANNER_VIEW_DELEGATE_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_CREDIT_CARD_SCANNER_VIEW_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller.h b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller.h
index 39f4a9a..1ac6718 100644
--- a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller.h
+++ b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_OFFER_NOTIFICATION_BUBBLE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_OFFER_NOTIFICATION_BUBBLE_CONTROLLER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller.h b/chrome/browser/ui/autofill/payments/save_card_bubble_controller.h
index e70afacc..b4c4e3d 100644
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller.h
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_SAVE_CARD_BUBBLE_CONTROLLER_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/autofill/payments/save_payment_icon_controller.h b/chrome/browser/ui/autofill/payments/save_payment_icon_controller.h
index 2643906..c917609 100644
--- a/chrome/browser/ui/autofill/payments/save_payment_icon_controller.h
+++ b/chrome/browser/ui/autofill/payments/save_payment_icon_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_SAVE_PAYMENT_ICON_CONTROLLER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_SAVE_PAYMENT_ICON_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "content/public/browser/web_contents.h"
 
diff --git a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller.h b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller.h
index bed5aebd..1edbf05b 100644
--- a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller.h
+++ b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_SAVE_UPI_BUBBLE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_SAVE_UPI_BUBBLE_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace autofill {
diff --git a/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller.h b/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller.h
index 952bbad..eabc6174 100644
--- a/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller.h
+++ b/chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_VIRTUAL_CARD_SELECTION_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_VIRTUAL_CARD_SELECTION_DIALOG_CONTROLLER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/autofill/save_address_profile_bubble_controller_impl.h b/chrome/browser/ui/autofill/save_address_profile_bubble_controller_impl.h
index c32fee8..4495bcb 100644
--- a/chrome/browser/ui/autofill/save_address_profile_bubble_controller_impl.h
+++ b/chrome/browser/ui/autofill/save_address_profile_bubble_controller_impl.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_SAVE_ADDRESS_PROFILE_BUBBLE_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_SAVE_ADDRESS_PROFILE_BUBBLE_CONTROLLER_IMPL_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_bubble_controller_base.h"
 #include "chrome/browser/ui/autofill/save_address_profile_bubble_controller.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_editor.h b/chrome/browser/ui/bookmarks/bookmark_editor.h
index 3d0ad90..59292d6 100644
--- a/chrome/browser/ui/bookmarks/bookmark_editor.h
+++ b/chrome/browser/ui/bookmarks/bookmark_editor.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_
 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_
 
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.h b/chrome/browser/ui/bookmarks/bookmark_utils.h
index 64a1e068..16c457536 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.h
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
index 6ed78d9..89adad04 100644
--- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc
+++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 
 #include <memory>
+#include <string>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index 51d62b3..7a9790c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -6,6 +6,8 @@
 
 #import <AppKit/AppKit.h>
 
+#include <string>
+
 #include "base/guid.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
index a158b4b..3f29ff2 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
@@ -4,6 +4,8 @@
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 
+#include <string>
+
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/cocoa/main_menu_builder.h b/chrome/browser/ui/cocoa/main_menu_builder.h
index 0921fda..bc30b68 100644
--- a/chrome/browser/ui/cocoa/main_menu_builder.h
+++ b/chrome/browser/ui/cocoa/main_menu_builder.h
@@ -8,6 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include <ostream>
+#include <string>
 #include <vector>
 
 #include "base/check_op.h"
diff --git a/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.h b/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.h
index 7100b05..971cf67a 100644
--- a/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.h
+++ b/chrome/browser/ui/cocoa/rosetta_required_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_COCOA_ROSETTA_REQUIRED_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_COCOA_ROSETTA_REQUIRED_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
index eb65457..5c551b8b 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
@@ -7,6 +7,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/mac/scoped_nsobject.h"
diff --git a/chrome/browser/ui/commander/commander_backend.h b/chrome/browser/ui/commander/commander_backend.h
index 2084e2d..0d972706 100644
--- a/chrome/browser/ui/commander/commander_backend.h
+++ b/chrome/browser/ui/commander/commander_backend.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_COMMANDER_COMMANDER_BACKEND_H_
 #define CHROME_BROWSER_UI_COMMANDER_COMMANDER_BACKEND_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/commander/commander_controller_unittest.cc b/chrome/browser/ui/commander/commander_controller_unittest.cc
index dbdd330b..e7870da 100644
--- a/chrome/browser/ui/commander/commander_controller_unittest.cc
+++ b/chrome/browser/ui/commander/commander_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/commander/commander_controller.h"
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
diff --git a/chrome/browser/ui/commander/commander_frontend.h b/chrome/browser/ui/commander/commander_frontend.h
index d9dd53f..e25a126 100644
--- a/chrome/browser/ui/commander/commander_frontend.h
+++ b/chrome/browser/ui/commander/commander_frontend.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_COMMANDER_COMMANDER_FRONTEND_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/commander/commander_view_model.h b/chrome/browser/ui/commander/commander_view_model.h
index 9533c52..0caaf2a 100644
--- a/chrome/browser/ui/commander/commander_view_model.h
+++ b/chrome/browser/ui/commander/commander_view_model.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_COMMANDER_COMMANDER_VIEW_MODEL_H_
 #define CHROME_BROWSER_UI_COMMANDER_COMMANDER_VIEW_MODEL_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/commander/entity_match.h b/chrome/browser/ui/commander/entity_match.h
index 98b54aa0..732ea4d 100644
--- a/chrome/browser/ui/commander/entity_match.h
+++ b/chrome/browser/ui/commander/entity_match.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_COMMANDER_ENTITY_MATCH_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/commander/fuzzy_finder.h b/chrome/browser/ui/commander/fuzzy_finder.h
index 25d40a5b..ae2ddea 100644
--- a/chrome/browser/ui/commander/fuzzy_finder.h
+++ b/chrome/browser/ui/commander/fuzzy_finder.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_COMMANDER_FUZZY_FINDER_H_
 #define CHROME_BROWSER_UI_COMMANDER_FUZZY_FINDER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/confirm_bubble_model.h b/chrome/browser/ui/confirm_bubble_model.h
index 1e7f44c..9b54a416 100644
--- a/chrome/browser/ui/confirm_bubble_model.h
+++ b/chrome/browser/ui/confirm_bubble_model.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_CONFIRM_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONFIRM_BUBBLE_MODEL_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_types.h"
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.h b/chrome/browser/ui/content_settings/content_setting_image_model.h
index 400a12a..535d8ba2 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/enterprise_startup_dialog.h b/chrome/browser/ui/enterprise_startup_dialog.h
index 62b53d8..874fbae69 100644
--- a/chrome/browser/ui/enterprise_startup_dialog.h
+++ b/chrome/browser/ui/enterprise_startup_dialog.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_ENTERPRISE_STARTUP_DIALOG_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/optional.h"
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h
index 4e9b0cb..b0a5952 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_
 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "url/gurl.h"
 
diff --git a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
index 9ce5fe0..5a395fe2 100644
--- a/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
+++ b/chrome/browser/ui/extensions/blocked_action_bubble_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/extensions/blocked_action_bubble_delegate.h"
 
+#include <string>
 #include <utility>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/extensions/settings_overridden_dialog_controller.h b/chrome/browser/ui/extensions/settings_overridden_dialog_controller.h
index 2355164..1668a1f 100644
--- a/chrome/browser/ui/extensions/settings_overridden_dialog_controller.h
+++ b/chrome/browser/ui/extensions/settings_overridden_dialog_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SETTINGS_OVERRIDDEN_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_UI_EXTENSIONS_SETTINGS_OVERRIDDEN_DIALOG_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace gfx {
diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc
index d9ba183..7722ea0 100644
--- a/chrome/browser/ui/find_bar/find_backend_unittest.cc
+++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/find_bar/find_bar.h b/chrome/browser/ui/find_bar/find_bar.h
index 5fa9a07..5dbcc7c4 100644
--- a/chrome/browser/ui/find_bar/find_bar.h
+++ b/chrome/browser/ui/find_bar/find_bar.h
@@ -9,6 +9,8 @@
 #ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_H_
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/chrome/browser/ui/find_bar/find_bar_controller.h b/chrome/browser/ui/find_bar/find_bar_controller.h
index e0100dd..08a6e06 100644
--- a/chrome/browser/ui/find_bar/find_bar_controller.h
+++ b/chrome/browser/ui/find_bar/find_bar_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_CONTROLLER_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index dc338d90..3f4dcce 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper.h b/chrome/browser/ui/find_bar/find_bar_platform_helper.h
index a347212..ca40b2b 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper.h
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_PLATFORM_HELPER_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
index 43c5859..537fd3d 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
@@ -4,6 +4,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
index 59b41ff..d5d7b65a 100644
--- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
+++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac_interactive_uitest.mm
@@ -4,6 +4,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_state.h b/chrome/browser/ui/find_bar/find_bar_state.h
index 60ca84a..3812954 100644
--- a/chrome/browser/ui/find_bar/find_bar_state.h
+++ b/chrome/browser/ui/find_bar/find_bar_state.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/find_in_page/find_tab_helper.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_state_factory.h b/chrome/browser/ui/find_bar/find_bar_state_factory.h
index 0e5f04a6..0e20547 100644
--- a/chrome/browser/ui/find_bar/find_bar_state_factory.h
+++ b/chrome/browser/ui/find_bar/find_bar_state_factory.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_FACTORY_H_
 #define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_FACTORY_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/global_error/global_error.h b/chrome/browser/ui/global_error/global_error.h
index 6c8a6db0..9797666 100644
--- a/chrome/browser/ui/global_error/global_error.h
+++ b/chrome/browser/ui/global_error/global_error.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_
 #define CHROME_BROWSER_UI_GLOBAL_ERROR_GLOBAL_ERROR_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h
index 50faf5e..2723f71 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.h
+++ b/chrome/browser/ui/hung_plugin_tab_helper.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_core.h b/chrome/browser/ui/hung_renderer/hung_renderer_core.h
index 6bd2a450..1872074 100644
--- a/chrome/browser/ui/hung_renderer/hung_renderer_core.h
+++ b/chrome/browser/ui/hung_renderer/hung_renderer_core.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_HUNG_RENDERER_HUNG_RENDERER_CORE_H_
 #define CHROME_BROWSER_UI_HUNG_RENDERER_HUNG_RENDERER_CORE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/managed_ui.h b/chrome/browser/ui/managed_ui.h
index 21cd65d..8c9be0e 100644
--- a/chrome/browser/ui/managed_ui.h
+++ b/chrome/browser/ui/managed_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_MANAGED_UI_H_
 #define CHROME_BROWSER_UI_MANAGED_UI_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "build/chromeos_buildflags.h"
 
diff --git a/chrome/browser/ui/media_router/cast_dialog_model.h b/chrome/browser/ui/media_router/cast_dialog_model.h
index 9b7ad59..091d9ecd 100644
--- a/chrome/browser/ui/media_router/cast_dialog_model.h
+++ b/chrome/browser/ui/media_router/cast_dialog_model.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_CAST_DIALOG_MODEL_H_
 #define CHROME_BROWSER_UI_MEDIA_ROUTER_CAST_DIALOG_MODEL_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/media_router/ui_media_sink.h"
diff --git a/chrome/browser/ui/media_router/ui_media_sink.h b/chrome/browser/ui/media_router/ui_media_sink.h
index 8fd65b9..b6602a4a 100644
--- a/chrome/browser/ui/media_router/ui_media_sink.h
+++ b/chrome/browser/ui/media_router/ui_media_sink.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_UI_MEDIA_SINK_H_
 #define CHROME_BROWSER_UI_MEDIA_ROUTER_UI_MEDIA_SINK_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/media_router/media_cast_mode.h"
 #include "components/media_router/common/issue.h"
diff --git a/chrome/browser/ui/omnibox/clipboard_utils.h b/chrome/browser/ui/omnibox/clipboard_utils.h
index f1f7782..d3f9fe9 100644
--- a/chrome/browser/ui/omnibox/clipboard_utils.h
+++ b/chrome/browser/ui/omnibox/clipboard_utils.h
@@ -7,6 +7,8 @@
 #ifndef CHROME_BROWSER_UI_OMNIBOX_CLIPBOARD_UTILS_H_
 #define CHROME_BROWSER_UI_OMNIBOX_CLIPBOARD_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 // Truncates the clipboard text returned in order to improve performance and
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 041c9b2..493302b4 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -6,6 +6,7 @@
 #include <stdio.h>
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/run_loop.h"
diff --git a/chrome/browser/ui/passwords/credential_leak_dialog_controller.h b/chrome/browser/ui/passwords/credential_leak_dialog_controller.h
index 134293b6..b331b51 100644
--- a/chrome/browser/ui/passwords/credential_leak_dialog_controller.h
+++ b/chrome/browser/ui/passwords/credential_leak_dialog_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_LEAK_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_LEAK_DIALOG_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/passwords/password_base_dialog_controller.h"
 #include "ui/gfx/range/range.h"
diff --git a/chrome/browser/ui/passwords/credential_manager_dialog_controller.h b/chrome/browser/ui/passwords/credential_manager_dialog_controller.h
index ae95a4a..7d8c0b3 100644
--- a/chrome/browser/ui/passwords/credential_manager_dialog_controller.h
+++ b/chrome/browser/ui/passwords/credential_manager_dialog_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_PASSWORDS_CREDENTIAL_MANAGER_DIALOG_CONTROLLER_H_
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/passwords/manage_passwords_state.h b/chrome/browser/ui/passwords/manage_passwords_state.h
index c145fca2..4bf9dc7 100644
--- a/chrome/browser/ui/passwords/manage_passwords_state.h
+++ b/chrome/browser/ui/passwords/manage_passwords_state.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.cc b/chrome/browser/ui/passwords/manage_passwords_test.cc
index b2cb995e..7882a2c 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_test.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/passwords/manage_passwords_test.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 0297a65..5f7027d 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.h b/chrome/browser/ui/passwords/manage_passwords_view_utils.h
index 28a24ed..204ca3ed 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils.h
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_VIEW_UTILS_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_VIEW_UTILS_H_
 
+#include <string>
 #include <utility>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
index a22b61e2..14f9eb3 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/passwords/password_generation_popup_controller.h b/chrome/browser/ui/passwords/password_generation_popup_controller.h
index a888a80ff..07471966 100644
--- a/chrome/browser/ui/passwords/password_generation_popup_controller.h
+++ b/chrome/browser/ui/passwords/password_generation_popup_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_PASSWORDS_PASSWORD_GENERATION_POPUP_CONTROLLER_H_
 #define CHROME_BROWSER_UI_PASSWORDS_PASSWORD_GENERATION_POPUP_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
 
diff --git a/chrome/browser/ui/passwords/password_generation_popup_view_browsertest.cc b/chrome/browser/ui/passwords/password_generation_popup_view_browsertest.cc
index 31cb5347..23b2f1e 100644
--- a/chrome/browser/ui/passwords/password_generation_popup_view_browsertest.cc
+++ b/chrome/browser/ui/passwords/password_generation_popup_view_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/passwords/password_generation_popup_view.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/passwords/passwords_client_ui_delegate.h b/chrome/browser/ui/passwords/passwords_client_ui_delegate.h
index 048cd369..2b0c73eb 100644
--- a/chrome/browser/ui/passwords/passwords_client_ui_delegate.h
+++ b/chrome/browser/ui/passwords/passwords_client_ui_delegate.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
diff --git a/chrome/browser/ui/process_singleton_dialog_linux.h b/chrome/browser/ui/process_singleton_dialog_linux.h
index ffea405..86ad373 100644
--- a/chrome/browser/ui/process_singleton_dialog_linux.h
+++ b/chrome/browser/ui/process_singleton_dialog_linux.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_PROCESS_SINGLETON_DIALOG_LINUX_H_
 #define CHROME_BROWSER_UI_PROCESS_SINGLETON_DIALOG_LINUX_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 // Displays an error to the user when the ProcessSingleton cannot acquire the
diff --git a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
index 6146f62..f52ca995 100644
--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
+++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_QRCODE_GENERATOR_QRCODE_GENERATOR_BUBBLE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_QRCODE_GENERATOR_QRCODE_GENERATOR_BUBBLE_CONTROLLER_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/ui/screen_capture_notification_ui.h b/chrome/browser/ui/screen_capture_notification_ui.h
index da0f61d..2e63bf66 100644
--- a/chrome/browser/ui/screen_capture_notification_ui.h
+++ b/chrome/browser/ui/screen_capture_notification_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_SCREEN_CAPTURE_NOTIFICATION_UI_H_
 #define CHROME_BROWSER_UI_SCREEN_CAPTURE_NOTIFICATION_UI_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
index 0c9a43d..d85e6b9d 100644
--- a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
+++ b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/screen_capture_notification_ui.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/search/omnibox_utils.h b/chrome/browser/ui/search/omnibox_utils.h
index d19d56a..627e9b0 100644
--- a/chrome/browser/ui/search/omnibox_utils.h
+++ b/chrome/browser/ui/search/omnibox_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_SEARCH_OMNIBOX_UTILS_H_
 #define CHROME_BROWSER_UI_SEARCH_OMNIBOX_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace content {
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index 42b6661..e02d1a4e7 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <tuple>
 #include <vector>
 
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 566ca27..11e625f 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
index ef6a7a4c..6f8ad1d27 100644
--- a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
+++ b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_SEND_TAB_TO_SELF_SEND_TAB_TO_SELF_BUBBLE_CONTROLLER_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/simple_message_box.h b/chrome/browser/ui/simple_message_box.h
index 7421b72..a3155e72 100644
--- a/chrome/browser/ui/simple_message_box.h
+++ b/chrome/browser/ui/simple_message_box.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_SIMPLE_MESSAGE_BOX_H_
 #define CHROME_BROWSER_UI_SIMPLE_MESSAGE_BOX_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/startup/automation_infobar_delegate.h b/chrome/browser/ui/startup/automation_infobar_delegate.h
index 315bd63..8614be38 100644
--- a/chrome/browser/ui/startup/automation_infobar_delegate.h
+++ b/chrome/browser/ui/startup/automation_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_STARTUP_AUTOMATION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_STARTUP_AUTOMATION_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
index d2ffb6b1..704e500 100644
--- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
+++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/startup/credential_provider_signin_dialog_win.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
index 00b388f3..4fda26f 100644
--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
+++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_STARTUP_GOOGLE_API_KEYS_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_STARTUP_GOOGLE_API_KEYS_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
index 920749d1..efe891a 100644
--- a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
+++ b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_STARTUP_OBSOLETE_SYSTEM_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_STARTUP_OBSOLETE_SYSTEM_INFOBAR_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
index 89017c0..f3092a7 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TAB_MODAL_CONFIRM_DIALOG_DELEGATE_H_
 #define CHROME_BROWSER_UI_TAB_MODAL_CONFIRM_DIALOG_DELEGATE_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
index 5a6895f..c38261c6 100644
--- a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
+++ b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TAB_SHARING_TAB_SHARING_UI_H_
 #define CHROME_BROWSER_UI_TAB_SHARING_TAB_SHARING_UI_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 
diff --git a/chrome/browser/ui/tab_ui_helper.h b/chrome/browser/ui/tab_ui_helper.h
index e166b75..bf7af0a 100644
--- a/chrome/browser/ui/tab_ui_helper.h
+++ b/chrome/browser/ui/tab_ui_helper.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TAB_UI_HELPER_H_
 #define CHROME_BROWSER_UI_TAB_UI_HELPER_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/tabs/tab_group.cc b/chrome/browser/ui/tabs/tab_group.cc
index a3508f6..dc6bee8 100644
--- a/chrome/browser/ui/tabs/tab_group.cc
+++ b/chrome/browser/ui/tabs/tab_group.cc
@@ -6,6 +6,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/tabs/tab_group.h b/chrome/browser/ui/tabs/tab_group.h
index 176c658..4e548cf 100644
--- a/chrome/browser/ui/tabs/tab_group.h
+++ b/chrome/browser/ui/tabs/tab_group.h
@@ -10,6 +10,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/tabs/tab_renderer_data.h b/chrome/browser/ui/tabs/tab_renderer_data.h
index 708dceae..c27ff7a 100644
--- a/chrome/browser/ui/tabs/tab_renderer_data.h
+++ b/chrome/browser/ui/tabs/tab_renderer_data.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TABS_TAB_RENDERER_DATA_H_
 #define CHROME_BROWSER_UI_TABS_TAB_RENDERER_DATA_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/tabs/tab_network_state.h"
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
index c61701b6..40b883e 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -10,6 +10,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/containers/span.h"
diff --git a/chrome/browser/ui/test/test_confirm_bubble_model.cc b/chrome/browser/ui/test/test_confirm_bubble_model.cc
index 182b912..ade679e0 100644
--- a/chrome/browser/ui/test/test_confirm_bubble_model.cc
+++ b/chrome/browser/ui/test/test_confirm_bubble_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/test/test_confirm_bubble_model.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 500760c..07dedc6 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
index 17cacd5..f67ce04b 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_BUILDER_TEST_HELPER_H_
 #define CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_BUILDER_TEST_HELPER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
index d7e0181..fad99db 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
diff --git a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
index b9dc1b0..00e50e5 100644
--- a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index 03d5058b..cfca584 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/ui/translate/source_language_combobox_model.h b/chrome/browser/ui/translate/source_language_combobox_model.h
index 2ebfd18..8051ef2 100644
--- a/chrome/browser/ui/translate/source_language_combobox_model.h
+++ b/chrome/browser/ui/translate/source_language_combobox_model.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_TRANSLATE_SOURCE_LANGUAGE_COMBOBOX_MODEL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/translate/target_language_combobox_model.h b/chrome/browser/ui/translate/target_language_combobox_model.h
index 380a1759..9e3b0c5 100644
--- a/chrome/browser/ui/translate/target_language_combobox_model.h
+++ b/chrome/browser/ui/translate/target_language_combobox_model.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_TRANSLATE_TARGET_LANGUAGE_COMBOBOX_MODEL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/translate/translate_bubble_test_utils.h b/chrome/browser/ui/translate/translate_bubble_test_utils.h
index e7a0c9a..d966961 100644
--- a/chrome/browser/ui/translate/translate_bubble_test_utils.h
+++ b/chrome/browser/ui/translate/translate_bubble_test_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_BUBBLE_TEST_UTILS_H_
 #define CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_BUBBLE_TEST_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 class TranslateBubbleModel;
diff --git a/chrome/browser/ui/user_education/feature_promo_text_replacements.cc b/chrome/browser/ui/user_education/feature_promo_text_replacements.cc
index 30f0e028..f6cbfe0 100644
--- a/chrome/browser/ui/user_education/feature_promo_text_replacements.cc
+++ b/chrome/browser/ui/user_education/feature_promo_text_replacements.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/user_education/feature_promo_text_replacements.h"
 
+#include <string>
 #include <utility>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/user_education/feature_promo_text_replacements.h b/chrome/browser/ui/user_education/feature_promo_text_replacements.h
index 8f9d581..2f49d2d 100644
--- a/chrome/browser/ui/user_education/feature_promo_text_replacements.h
+++ b/chrome/browser/ui/user_education/feature_promo_text_replacements.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_USER_EDUCATION_FEATURE_PROMO_TEXT_REPLACEMENTS_H_
 #define CHROME_BROWSER_UI_USER_EDUCATION_FEATURE_PROMO_TEXT_REPLACEMENTS_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_dialog_view.h b/chrome/browser/ui/views/apps/app_dialog/app_dialog_view.h
index 44f328f..3ee394c 100644
--- a/chrome/browser/ui/views/apps/app_dialog/app_dialog_view.h
+++ b/chrome/browser/ui/views/apps/app_dialog/app_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_DIALOG_APP_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_APP_DIALOG_APP_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 #include "ui/views/controls/label.h"
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
index 3e98ad4..fdb9b1a 100644
--- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/feature_list.h"
diff --git a/chrome/browser/ui/views/autofill/payments/payments_view_util.h b/chrome/browser/ui/views/autofill/payments/payments_view_util.h
index 43e5bab..b2428ade 100644
--- a/chrome/browser/ui/views/autofill/payments/payments_view_util.h
+++ b/chrome/browser/ui/views/autofill/payments/payments_view_util.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_PAYMENTS_VIEW_UTIL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/payments/legal_message_line.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index 80b9223..7748ef9 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/views/certificate_selector.h b/chrome/browser/ui/views/certificate_selector.h
index ae09076..1685773 100644
--- a/chrome/browser/ui/views/certificate_selector.h
+++ b/chrome/browser/ui/views/certificate_selector.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_CERTIFICATE_SELECTOR_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/chrome_cleaner_dialog_win.cc b/chrome/browser/ui/views/chrome_cleaner_dialog_win.cc
index a962995..bda6f1d 100644
--- a/chrome/browser/ui/views/chrome_cleaner_dialog_win.cc
+++ b/chrome/browser/ui/views/chrome_cleaner_dialog_win.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/chrome_cleaner_dialog_win.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_win.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.cc b/chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.cc
index c787a29..931afe81 100644
--- a/chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.cc
+++ b/chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/chrome_cleaner_reboot_dialog_win.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_reboot_dialog_controller_win.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h
index 72f053e..c6aff1c 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.h
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index dd891b38..ed0e804 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <array>
+#include <string>
 #include <utility>
 
 #include "base/i18n/time_formatting.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h
index b3eb5564..8fd1898 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.h
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/device_chooser_content_view.cc b/chrome/browser/ui/views/device_chooser_content_view.cc
index 4ab6bf87..e6a848c6 100644
--- a/chrome/browser/ui/views/device_chooser_content_view.cc
+++ b/chrome/browser/ui/views/device_chooser_content_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/device_chooser_content_view.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
diff --git a/chrome/browser/ui/views/device_chooser_content_view.h b/chrome/browser/ui/views/device_chooser_content_view.h
index ec70216..b8bdbd0 100644
--- a/chrome/browser/ui/views/device_chooser_content_view.h
+++ b/chrome/browser/ui/views/device_chooser_content_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_DEVICE_CHOOSER_CONTENT_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index dff79a4..eceb4a71 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <utility>
 
 #include "base/files/file_path.h"
diff --git a/chrome/browser/ui/views/extensions/expandable_container_view.h b/chrome/browser/ui/views/extensions/expandable_container_view.h
index 5374c43c..52f61ef6 100644
--- a/chrome/browser/ui/views/extensions/expandable_container_view.h
+++ b/chrome/browser/ui/views/extensions/expandable_container_view.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXPANDABLE_CONTAINER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXPANDABLE_CONTAINER_VIEW_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h
index 155e387..6e920883e 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog.h
+++ b/chrome/browser/ui/views/extensions/extension_dialog.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_DIALOG_H_
 
 #include <memory>
+#include <string>
 
 #include "base/logging.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view.h b/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view.h
index 89a014e2..a6b8c54 100644
--- a/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view.h
+++ b/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_BLOCKED_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_BLOCKED_DIALOG_VIEW_H_
 
+#include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index 00d996d3..9dfa5e75 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view.h b/chrome/browser/ui/views/extensions/extensions_menu_view.h
index 25bcf289..3aa47f9 100644
--- a/chrome/browser/ui/views/extensions/extensions_menu_view.h
+++ b/chrome/browser/ui/views/extensions/extensions_menu_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_MENU_VIEW_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
diff --git a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h
index 9f85a64..6b937e8 100644
--- a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h
+++ b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERY_CHECKBOX_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERY_CHECKBOX_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/extensions/print_job_confirmation_dialog_view.h b/chrome/browser/ui/views/extensions/print_job_confirmation_dialog_view.h
index f72800d..ced4c77 100644
--- a/chrome/browser/ui/views/extensions/print_job_confirmation_dialog_view.h
+++ b/chrome/browser/ui/views/extensions/print_job_confirmation_dialog_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_PRINT_JOB_CONFIRMATION_DIALOG_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h b/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h
index 0afdf06..fbfccb4 100644
--- a/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h
+++ b/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_REQUEST_FILE_SYSTEM_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_REQUEST_FILE_SYSTEM_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/views/file_system_access/file_system_access_permission_view.h b/chrome/browser/ui/views/file_system_access/file_system_access_permission_view.h
index 4d637469..76e8ecb 100644
--- a/chrome/browser/ui/views/file_system_access/file_system_access_permission_view.h
+++ b/chrome/browser/ui/views/file_system_access/file_system_access_permission_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_VIEW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
diff --git a/chrome/browser/ui/views/file_system_access/file_system_access_restricted_directory_dialog_view.h b/chrome/browser/ui/views/file_system_access/file_system_access_restricted_directory_dialog_view.h
index e52b5975..92fc1838 100644
--- a/chrome/browser/ui/views/file_system_access/file_system_access_restricted_directory_dialog_view.h
+++ b/chrome/browser/ui/views/file_system_access/file_system_access_restricted_directory_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_RESTRICTED_DIRECTORY_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_RESTRICTED_DIRECTORY_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/file_system_access_permission_context.h"
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h
index 0876b6b2..4b0ad7f 100644
--- a/chrome/browser/ui/views/find_bar_view.h
+++ b/chrome/browser/ui/views/find_bar_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/folder_upload_confirmation_view.h b/chrome/browser/ui/views/folder_upload_confirmation_view.h
index 714d6f99..63bb95e 100644
--- a/chrome/browser/ui/views/folder_upload_confirmation_view.h
+++ b/chrome/browser/ui/views/folder_upload_confirmation_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_FOLDER_UPLOAD_CONFIRMATION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FOLDER_UPLOAD_CONFIRMATION_VIEW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/shell_dialogs/selected_file_info.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
index 6167f864..544e59e 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace gfx {
diff --git a/chrome/browser/ui/views/hover_button.h b/chrome/browser/ui/views/hover_button.h
index ebcea24..b78ef4a 100644
--- a/chrome/browser/ui/views/hover_button.h
+++ b/chrome/browser/ui/views/hover_button.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_HOVER_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_HOVER_BUTTON_H_
 
+#include <string>
+
 #include "base/gtest_prod_util.h"
 #include "base/optional.h"
 #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc b/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
index 6c723cfe..d8186aa 100644
--- a/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.h"
 
 #include <memory>
+#include <string>
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/views/login_handler_views.cc b/chrome/browser/ui/views/login_handler_views.cc
index a7957c623..3aff023 100644
--- a/chrome/browser/ui/views/login_handler_views.cc
+++ b/chrome/browser/ui/views/login_handler_views.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/login/login_handler.h"
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/login_view.h b/chrome/browser/ui/views/login_view.h
index a06e84f..771e3ba8 100644
--- a/chrome/browser/ui/views/login_view.h
+++ b/chrome/browser/ui/views/login_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_LOGIN_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOGIN_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/login/login_handler.h"
 #include "components/password_manager/core/browser/http_auth_observer.h"
diff --git a/chrome/browser/ui/views/md_text_button_with_down_arrow.h b/chrome/browser/ui/views/md_text_button_with_down_arrow.h
index 92c06b16..3ab0603 100644
--- a/chrome/browser/ui/views/md_text_button_with_down_arrow.h
+++ b/chrome/browser/ui/views/md_text_button_with_down_arrow.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_MD_TEXT_BUTTON_WITH_DOWN_ARROW_H_
 #define CHROME_BROWSER_UI_VIEWS_MD_TEXT_BUTTON_WITH_DOWN_ARROW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/views/controls/button/md_text_button.h"
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc
index 59600b2..108de9f5 100644
--- a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc
+++ b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/views/media_router/cloud_services_dialog_view.h b/chrome/browser/ui/views/media_router/cloud_services_dialog_view.h
index 90e61cf..719b74c 100644
--- a/chrome/browser/ui/views/media_router/cloud_services_dialog_view.h
+++ b/chrome/browser/ui/views/media_router/cloud_services_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_CLOUD_SERVICES_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_CLOUD_SERVICES_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 #include "ui/views/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.h b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.h
index 455b542..4fb28e7 100644
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.h
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_PRESENTATION_RECEIVER_WINDOW_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_row_view.h b/chrome/browser/ui/views/omnibox/omnibox_row_view.h
index a6fd6349..cf0d2bb2 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_row_view.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_row_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_ROW_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_ROW_VIEW_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "ui/views/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view.cc b/chrome/browser/ui/views/page_action/pwa_install_view.cc
index f84e406..e258979 100644
--- a/chrome/browser/ui/views/page_action/pwa_install_view.cc
+++ b/chrome/browser/ui/views/page_action/pwa_install_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/page_action/pwa_install_view.h"
 
+#include <string>
+
 #include "base/callback_helpers.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/ui/views/page_info/chosen_object_view.h b/chrome/browser/ui/views/page_info/chosen_object_view.h
index c87020d..c5641321 100644
--- a/chrome/browser/ui/views/page_info/chosen_object_view.h
+++ b/chrome/browser/ui/views/page_info/chosen_object_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_CHOSEN_OBJECT_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "components/page_info/page_info_ui.h"
 #include "ui/views/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
index 4a432707..c31950d 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
@@ -8,6 +8,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
index e972b88..c8fd34a 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/page_info/page_info_bubble_view_base.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/page_info/page_info_dialog.h"
 #include "components/page_info/page_info_ui.h"
diff --git a/chrome/browser/ui/views/page_info/page_info_hover_button.h b/chrome/browser/ui/views/page_info/page_info_hover_button.h
index 4081bcde..c06b1f0 100644
--- a/chrome/browser/ui/views/page_info/page_info_hover_button.h
+++ b/chrome/browser/ui/views/page_info/page_info_hover_button.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_HOVER_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_HOVER_BUTTON_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/hover_button.h"
diff --git a/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc b/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
index 6d7c1c8..0245ddd 100644
--- a/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
+++ b/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.cc b/chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.cc
index e38d78a9..a04f2ea 100644
--- a/chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.cc
+++ b/chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.h"
 
 #include <numeric>
+#include <string>
 #include <utility>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/payments/editor_view_controller.h b/chrome/browser/ui/views/payments/editor_view_controller.h
index 42d6c2a7..500e32c 100644
--- a/chrome/browser/ui/views/payments/editor_view_controller.h
+++ b/chrome/browser/ui/views/payments/editor_view_controller.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <tuple>
 #include <unordered_map>
 #include <utility>
diff --git a/chrome/browser/ui/views/payments/payment_credential_enrollment_dialog_view.h b/chrome/browser/ui/views/payments/payment_credential_enrollment_dialog_view.h
index 1932a18..1b3be8a 100644
--- a/chrome/browser/ui/views/payments/payment_credential_enrollment_dialog_view.h
+++ b/chrome/browser/ui/views/payments/payment_credential_enrollment_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_CREDENTIAL_ENROLLMENT_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_CREDENTIAL_ENROLLMENT_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/payments/content/payment_credential_enrollment_view.h"
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
index 53bff8e..defe200 100644
--- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/payments/payment_method_view_controller.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h b/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h
index f5e3694..34d4ff0f 100644
--- a/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h
+++ b/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_SECURE_PAYMENT_CONFIRMATION_VIEWS_UTIL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
index 891f523..9a197b89 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/payments/shipping_option_view_controller.h"
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
diff --git a/chrome/browser/ui/views/payments/validating_textfield_unittest.cc b/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
index 331bdd9..67f5b0d 100644
--- a/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
+++ b/chrome/browser/ui/views/payments/validating_textfield_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/payments/validation_delegate.h b/chrome/browser/ui/views/payments/validation_delegate.h
index 31651ad..8d41c06 100644
--- a/chrome/browser/ui/views/payments/validation_delegate.h
+++ b/chrome/browser/ui/views/payments/validation_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_VALIDATION_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_VALIDATION_DELEGATE_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace views {
diff --git a/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc b/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
index 74d4d16..0227c19 100644
--- a/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
+++ b/chrome/browser/ui/views/permission_bubble/chooser_bubble_ui.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h
index 79698b7..987a5f0 100644
--- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h
+++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_PERMISSION_PROMPT_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_PERMISSION_PROMPT_BUBBLE_VIEW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/permission_bubble/permission_prompt_style.h"
diff --git a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
index 335402e..aa0d56bb 100644
--- a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
+++ b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc
index a0eac5d5..dd6be27 100644
--- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc
+++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
index 4d06f35c..01192db 100644
--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
+++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button_delegate.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_TOOLBAR_BUTTON_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_TOOLBAR_BUTTON_DELEGATE_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/read_later/read_later_button.cc b/chrome/browser/ui/views/read_later/read_later_button.cc
index e5e30089..5b36f45 100644
--- a/chrome/browser/ui/views/read_later/read_later_button.cc
+++ b/chrome/browser/ui/views/read_later/read_later_button.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/read_later/read_later_button.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/views/reader_mode/reader_mode_icon_view.h b/chrome/browser/ui/views/reader_mode/reader_mode_icon_view.h
index 50bcb7c6..307f5d8 100644
--- a/chrome/browser/ui/views/reader_mode/reader_mode_icon_view.h
+++ b/chrome/browser/ui/views/reader_mode/reader_mode_icon_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_READER_MODE_READER_MODE_ICON_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_READER_MODE_READER_MODE_ICON_VIEW_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/page_action/page_action_icon_view.h"
 #include "components/dom_distiller/content/browser/distillable_page_utils.h"
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index f6ff626..7b1ff8f 100644
--- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h"
 
+#include <string>
 #include <utility>
 
 #include "base/command_line.h"
diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog.h b/chrome/browser/ui/views/settings_reset_prompt_dialog.h
index 2913679c..bcc9f6b 100644
--- a/chrome/browser/ui/views/settings_reset_prompt_dialog.h
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_SETTINGS_RESET_PROMPT_DIALOG_H_
 #define CHROME_BROWSER_UI_VIEWS_SETTINGS_RESET_PROMPT_DIALOG_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_types.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h
index 0e63d56..58bc380a 100644
--- a/chrome/browser/ui/views/status_bubble_views.h
+++ b/chrome/browser/ui/views/status_bubble_views.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_
 
 #include <memory>
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
index 241e032f..8c8cd1f 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
@@ -9,6 +9,7 @@
 #include <wrl/implements.h>
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/subtle_notification_view.h b/chrome/browser/ui/views/subtle_notification_view.h
index 10eb551..22a93e6 100644
--- a/chrome/browser/ui/views/subtle_notification_view.h
+++ b/chrome/browser/ui/views/subtle_notification_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_SUBTLE_NOTIFICATION_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_view.h b/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_view.h
index d5566a1..9cc2ec5d 100644
--- a/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_view.h
+++ b/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_SUPERVISED_USER_EXTENSION_INSTALL_BLOCKED_BY_PARENT_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_SUPERVISED_USER_EXTENSION_INSTALL_BLOCKED_BY_PARENT_DIALOG_VIEW_H_
 
+#include <string>
+
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/sync/dice_signin_button_view.cc b/chrome/browser/ui/views/sync/dice_signin_button_view.cc
index 49a79df..48dbe54 100644
--- a/chrome/browser/ui/views/sync/dice_signin_button_view.cc
+++ b/chrome/browser/ui/views/sync/dice_signin_button_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/sync/dice_signin_button_view.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
index 398f2edc..a439d8d 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
+++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_DIALOG_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h
index 62e5a4e..d051afa 100644
--- a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h
+++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/views/tabs/color_picker_view_unittest.cc b/chrome/browser/ui/views/tabs/color_picker_view_unittest.cc
index 38de655..0017f3c 100644
--- a/chrome/browser/ui/views/tabs/color_picker_view_unittest.cc
+++ b/chrome/browser/ui/views/tabs/color_picker_view_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <array>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/tabs/tab_controller.h b/chrome/browser/ui/views/tabs/tab_controller.h
index c577d6a..00acf27 100644
--- a/chrome/browser/ui/views/tabs/tab_controller.h
+++ b/chrome/browser/ui/views/tabs/tab_controller.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_CONTROLLER_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/tabs/tab_types.h"
diff --git a/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h b/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h
index cb5d6f0..9eeb0c7 100644
--- a/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h
+++ b/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_GROUP_EDITOR_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_GROUP_EDITOR_BUBBLE_VIEW_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/tabs/tab_group_header.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_controller.h b/chrome/browser/ui/views/tabs/tab_strip_controller.h
index bcbd0514..d93164e 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_controller.h
+++ b/chrome/browser/ui/views/tabs/tab_strip_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/optional.h"
diff --git a/chrome/browser/ui/views/textfield_layout.h b/chrome/browser/ui/views/textfield_layout.h
index e6ea7a4..364ff9b 100644
--- a/chrome/browser/ui/views/textfield_layout.h
+++ b/chrome/browser/ui/views/textfield_layout.h
@@ -8,6 +8,7 @@
 #include "base/strings/string16.h"
 
 #include <memory>
+#include <string>
 
 namespace ui {
 class ComboboxModel;
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_model.h b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_model.h
index 4a55f26..de8ca591 100644
--- a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_model.h
+++ b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_model.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_BUBBLE_VIEW_MODEL_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_BUBBLE_VIEW_MODEL_H_
 
+#include <string>
 #include <vector>
 #include "base/strings/string16.h"
 #include "components/version_info/channel.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
index f0cf65e9..9457b06 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <memory>
+#include <string>
 
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
index d02a23c..63e405b 100644
--- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
+++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/toolbar/webui_tab_counter_button.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/i18n/message_formatter.h"
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc
index a8b74de..5197282 100644
--- a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc
+++ b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc
@@ -8,6 +8,7 @@
 
 #include <shellapi.h>
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/views/user_education/feature_promo_bubble_params.h b/chrome/browser/ui/views/user_education/feature_promo_bubble_params.h
index 70f1ff4f..53c85582 100644
--- a/chrome/browser/ui/views/user_education/feature_promo_bubble_params.h
+++ b/chrome/browser/ui/views/user_education/feature_promo_bubble_params.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_USER_EDUCATION_FEATURE_PROMO_BUBBLE_PARAMS_H_
 
 #include <memory>
+#include <string>
 
 #include "base/optional.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.h b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.h
index 4778a96..258d5f2 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.h
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_WEB_APPS_FRAME_TOOLBAR_WEB_APP_MENU_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_WEB_APPS_FRAME_TOOLBAR_WEB_APP_MENU_BUTTON_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
index dd987be..7a35a9f 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_WEB_APPS_FRAME_TOOLBAR_WEB_APP_ORIGIN_TEXT_H_
 #define CHROME_BROWSER_UI_VIEWS_WEB_APPS_FRAME_TOOLBAR_WEB_APP_ORIGIN_TEXT_H_
 
+#include <string>
+
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc
index 2732234..e7ee534b 100644
--- a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc
+++ b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.h"
 
+#include <string>
+
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc
index eda05eb5..7dde912 100644
--- a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/web_apps/web_app_confirmation_view.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.h b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.h
index 630788a..80370c1f1 100644
--- a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.h
+++ b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_WEB_APPS_WEB_APP_CONFIRMATION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEB_APPS_WEB_APP_CONFIRMATION_VIEW_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_view.h b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_view.h
index 78d3ad2..9145a6c6 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_view.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_CLIENT_PIN_ENTRY_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_CLIENT_PIN_ENTRY_VIEW_H_
 
+#include <string>
+
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
diff --git a/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc b/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
index e3a92c6d..47fc7216 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
+++ b/chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/webauthn/authenticator_request_dialog_view.h"
 
+#include <string>
+
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.h b/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.h
index bf8ead5..1780d5e 100644
--- a/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.h
+++ b/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_WEBAUTHN_AUTHENTICATOR_REQUEST_SHEET_VIEW_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/webauthn/hover_list_view.h b/chrome/browser/ui/views/webauthn/hover_list_view.h
index b7e101c..94a464e 100644
--- a/chrome/browser/ui/views/webauthn/hover_list_view.h
+++ b/chrome/browser/ui/views/webauthn/hover_list_view.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 #include "base/optional.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/webauthn/webauthn_hover_button.h b/chrome/browser/ui/views/webauthn/webauthn_hover_button.h
index f216754..de0b0b977 100644
--- a/chrome/browser/ui/views/webauthn/webauthn_hover_button.h
+++ b/chrome/browser/ui/views/webauthn/webauthn_hover_button.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_WEBAUTHN_WEBAUTHN_HOVER_BUTTON_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/hover_button.h"
diff --git a/chrome/browser/ui/views/webid/webid_permission_view.cc b/chrome/browser/ui/views/webid/webid_permission_view.cc
index b8fe51d..612c1fe0 100644
--- a/chrome/browser/ui/views/webid/webid_permission_view.cc
+++ b/chrome/browser/ui/views/webid/webid_permission_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/webid/webid_permission_view.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/web_applications/web_app_browsertest.cc b/chrome/browser/ui/web_applications/web_app_browsertest.cc
index 0ecf95a2..6262b66 100644
--- a/chrome/browser/ui/web_applications/web_app_browsertest.cc
+++ b/chrome/browser/ui/web_applications/web_app_browsertest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webauthn/authenticator_request_sheet_model.h b/chrome/browser/ui/webauthn/authenticator_request_sheet_model.h
index ceee4c5..055abbba 100644
--- a/chrome/browser/ui/webauthn/authenticator_request_sheet_model.h
+++ b/chrome/browser/ui/webauthn/authenticator_request_sheet_model.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_WEBAUTHN_AUTHENTICATOR_REQUEST_SHEET_MODEL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/strings/string16.h"
 
diff --git a/chrome/browser/ui/webauthn/hover_list_model.h b/chrome/browser/ui/webauthn/hover_list_model.h
index f727e87..21af93f 100644
--- a/chrome/browser/ui/webauthn/hover_list_model.h
+++ b/chrome/browser/ui/webauthn/hover_list_model.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <vector>
 
 #include "base/check.h"
diff --git a/chrome/browser/ui/webauthn/sheet_models.h b/chrome/browser/ui/webauthn/sheet_models.h
index 97c3e66..d413205 100644
--- a/chrome/browser/ui/webauthn/sheet_models.h
+++ b/chrome/browser/ui/webauthn/sheet_models.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_WEBAUTHN_SHEET_MODELS_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webauthn/transport_utils.h b/chrome/browser/ui/webauthn/transport_utils.h
index 8207d9b8..9f6a4e29 100644
--- a/chrome/browser/ui/webauthn/transport_utils.h
+++ b/chrome/browser/ui/webauthn/transport_utils.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBAUTHN_TRANSPORT_UTILS_H_
 #define CHROME_BROWSER_UI_WEBAUTHN_TRANSPORT_UTILS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/webauthn/authenticator_transport.h"
 
diff --git a/chrome/browser/ui/webauthn/webauthn_ui_helpers.h b/chrome/browser/ui/webauthn/webauthn_ui_helpers.h
index d6428a36..70193e07 100644
--- a/chrome/browser/ui/webauthn/webauthn_ui_helpers.h
+++ b/chrome/browser/ui/webauthn/webauthn_ui_helpers.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBAUTHN_WEBAUTHN_UI_HELPERS_H_
 #define CHROME_BROWSER_UI_WEBAUTHN_WEBAUTHN_UI_HELPERS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace webauthn_ui_helpers {
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
index 66a8d850..56141d53 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
index 6bd87d95..bdf5338 100644
--- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
+++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_dialog.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_DIALOG_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_DIALOG_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
diff --git a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
index c4480451..84b9170 100644
--- a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <string>
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.cc b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.cc
index cfaee45..5e120b05 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h"
 
+#include <string>
 #include <utility>
 
 #include "ash/constants/ash_features.h"
diff --git a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.cc b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.cc
index 836be9a..1904c3738 100644
--- a/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h"
 
+#include <string>
 #include <utility>
 
 #include "ash/constants/ash_features.h"
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.cc b/chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.cc
index deff814..f4e916d 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.cc
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_dialogs.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_dialogs.h
index d8c2b14..e3e65824 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_dialogs.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_dialogs.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IN_SESSION_PASSWORD_CHANGE_PASSWORD_CHANGE_DIALOGS_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IN_SESSION_PASSWORD_CHANGE_PASSWORD_CHANGE_DIALOGS_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
index b8d19af..0c66777d 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IN_SESSION_PASSWORD_CHANGE_PASSWORD_CHANGE_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IN_SESSION_PASSWORD_CHANGE_PASSWORD_CHANGE_UI_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc
index c55ef1e3..2e232ed 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
index 41d448e2..c7b68a5b 100644
--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
index 07255078..a3d76f7 100644
--- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
+++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
index 0ece2cd7..d8bb1bf 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_SCREEN_HANDLER_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.h
index 498ea0f4..cad19883 100644
--- a/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_PARENTAL_HANDOFF_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_PARENTAL_HANDOFF_SCREEN_HANDLER_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index bb299dc..433eebaf 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc
index bc04a96c..d2cb96b 100644
--- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
 
 #include <iterator>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
index 13d045b..4d7174b9 100644
--- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
+++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <set>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_basic.cc b/chrome/browser/ui/webui/help/version_updater_basic.cc
index dd5eae7..a843b38 100644
--- a/chrome/browser/ui/webui/help/version_updater_basic.cc
+++ b/chrome/browser/ui/webui/help/version_updater_basic.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/help/version_updater_basic.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/upgrade_detector/upgrade_detector.h"
 
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index dba49c73..92cebd1 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
 
 #include <cmath>
+#include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_win.h b/chrome/browser/ui/webui/help/version_updater_win.h
index c0207fc..7d8a5d3 100644
--- a/chrome/browser/ui/webui/help/version_updater_win.h
+++ b/chrome/browser/ui/webui/help/version_updater_win.h
@@ -8,6 +8,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_WIN_H_
 #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_WIN_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
index 33b2610..c9b798b6 100644
--- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
+++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/media/webrtc_logs_ui.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h
index fe04e03..c50c521 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.h
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
index f6a9ba3b..51e93224 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
index 0b94314e..837f795 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
 
 #include <map>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
index 699802af..4d18931 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <set>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/hierarchy.h b/chrome/browser/ui/webui/settings/chromeos/hierarchy.h
index 14b9156..a545b98 100644
--- a/chrome/browser/ui/webui/settings/chromeos/hierarchy.h
+++ b/chrome/browser/ui/webui/settings/chromeos/hierarchy.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_HIERARCHY_H_
 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_HIERARCHY_H_
 
+#include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
index 06f1ec6..4b435cb 100644
--- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h"
 
+#include <string>
 #include <utility>
 
 #include "ash/constants/ash_features.h"
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index 7f63fe9..65e2c7b 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/webui/settings/safety_check_handler.cc b/chrome/browser/ui/webui/settings/safety_check_handler.cc
index 3c08e46..7191e018 100644
--- a/chrome/browser/ui/webui/settings/safety_check_handler.cc
+++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/settings/safety_check_handler.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/i18n/number_formatting.h"
diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.cc b/chrome/browser/ui/webui/signin/profile_customization_handler.cc
index 8040893..57b810d5 100644
--- a/chrome/browser/ui/webui/signin/profile_customization_handler.cc
+++ b/chrome/browser/ui/webui/signin/profile_customization_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/signin/profile_customization_handler.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/ui/webui/version/version_handler.cc b/chrome/browser/ui/webui/version/version_handler.cc
index c38ef083..d24fccd 100644
--- a/chrome/browser/ui/webui/version/version_handler.cc
+++ b/chrome/browser/ui/webui/version/version_handler.cc
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h
index d6a72f2..46d1df2 100644
--- a/chrome/browser/ui/webui/web_ui_test_handler.h
+++ b/chrome/browser/ui/webui/web_ui_test_handler.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/welcome/bookmark_item.cc b/chrome/browser/ui/webui/welcome/bookmark_item.cc
index fc61b6b..2935092 100644
--- a/chrome/browser/ui/webui/welcome/bookmark_item.cc
+++ b/chrome/browser/ui/webui/welcome/bookmark_item.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/welcome/bookmark_item.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/values.h"
 
diff --git a/chrome/browser/updater/browser_updater_client_mac_unittest.mm b/chrome/browser/updater/browser_updater_client_mac_unittest.mm
index dd0a8b0..245e9d41 100644
--- a/chrome/browser/updater/browser_updater_client_mac_unittest.mm
+++ b/chrome/browser/updater/browser_updater_client_mac_unittest.mm
@@ -6,6 +6,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include <string>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/updates/update_notification_info.h b/chrome/browser/updates/update_notification_info.h
index 91d04755..e43da85 100644
--- a/chrome/browser/updates/update_notification_info.h
+++ b/chrome/browser/updates/update_notification_info.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UPDATES_UPDATE_NOTIFICATION_INFO_H_
 #define CHROME_BROWSER_UPDATES_UPDATE_NOTIFICATION_INFO_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 
 namespace updates {
diff --git a/chrome/browser/vr/model/omnibox_suggestions.h b/chrome/browser/vr/model/omnibox_suggestions.h
index 90be078..c2b2e27 100644
--- a/chrome/browser/vr/model/omnibox_suggestions.h
+++ b/chrome/browser/vr/model/omnibox_suggestions.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_VR_MODEL_OMNIBOX_SUGGESTIONS_H_
 #define CHROME_BROWSER_VR_MODEL_OMNIBOX_SUGGESTIONS_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/vr/vr_base_export.h"
 #include "components/omnibox/browser/autocomplete_match.h"
diff --git a/chrome/browser/vr/model/platform_toast.h b/chrome/browser/vr/model/platform_toast.h
index fba1684..25d07e5 100644
--- a/chrome/browser/vr/model/platform_toast.h
+++ b/chrome/browser/vr/model/platform_toast.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_VR_MODEL_PLATFORM_TOAST_H_
 #define CHROME_BROWSER_VR_MODEL_PLATFORM_TOAST_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/vr/vr_ui_export.h"
 
diff --git a/chrome/browser/vr/model/speech_recognition_model.h b/chrome/browser/vr/model/speech_recognition_model.h
index 603017f8e..f2a08fe 100644
--- a/chrome/browser/vr/model/speech_recognition_model.h
+++ b/chrome/browser/vr/model/speech_recognition_model.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_VR_MODEL_SPEECH_RECOGNITION_MODEL_H_
 #define CHROME_BROWSER_VR_MODEL_SPEECH_RECOGNITION_MODEL_H_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "chrome/browser/vr/vr_base_export.h"
 
diff --git a/chrome/browser/vr/speech_recognizer.cc b/chrome/browser/vr/speech_recognizer.cc
index f44d077c..a9311d2 100644
--- a/chrome/browser/vr/speech_recognizer.cc
+++ b/chrome/browser/vr/speech_recognizer.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/vr/speech_recognizer.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/vr/text_edit_action.h b/chrome/browser/vr/text_edit_action.h
index ffa025f..d7975c1 100644
--- a/chrome/browser/vr/text_edit_action.h
+++ b/chrome/browser/vr/text_edit_action.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_VR_TEXT_EDIT_ACTION_H_
 #define CHROME_BROWSER_VR_TEXT_EDIT_ACTION_H_
 
+#include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
diff --git a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
index e4b8205..917fd11 100644
--- a/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
+++ b/chrome/browser/web_applications/components/web_app_data_retriever_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/web_applications/components/web_app_data_retriever.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/web_applications/components/web_app_icon_generator_unittest.cc b/chrome/browser/web_applications/components/web_app_icon_generator_unittest.cc
index 1440070..a6ca710 100644
--- a/chrome/browser/web_applications/components/web_app_icon_generator_unittest.cc
+++ b/chrome/browser/web_applications/components/web_app_icon_generator_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/web_applications/components/web_app_icon_generator.h"
 
+#include <string>
 #include <vector>
 
 #include "base/containers/contains.h"
diff --git a/chrome/browser/web_applications/components/web_app_protocol_handler_registration_win.cc b/chrome/browser/web_applications/components/web_app_protocol_handler_registration_win.cc
index bf1069d..3575ea1 100644
--- a/chrome/browser/web_applications/components/web_app_protocol_handler_registration_win.cc
+++ b/chrome/browser/web_applications/components/web_app_protocol_handler_registration_win.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 <string>
 #include <utility>
 
 #include "chrome/browser/web_applications/components/web_app_protocol_handler_registration.h"
diff --git a/chrome/browser/web_applications/components/web_app_run_on_os_login.h b/chrome/browser/web_applications/components/web_app_run_on_os_login.h
index 163c3c1..db0f9ea 100644
--- a/chrome/browser/web_applications/components/web_app_run_on_os_login.h
+++ b/chrome/browser/web_applications/components/web_app_run_on_os_login.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_WEB_APP_RUN_ON_OS_LOGIN_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
diff --git a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
index 383f329..6f889e4 100644
--- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
+++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <list>
 #include <map>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/web_applications/components/web_app_shortcut_win.cc b/chrome/browser/web_applications/components/web_app_shortcut_win.cc
index 41b395e..68d98dd 100644
--- a/chrome/browser/web_applications/components/web_app_shortcut_win.cc
+++ b/chrome/browser/web_applications/components/web_app_shortcut_win.cc
@@ -8,6 +8,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/check_op.h"
diff --git a/chrome/browser/web_applications/components/web_app_shortcuts_menu_win.cc b/chrome/browser/web_applications/components/web_app_shortcuts_menu_win.cc
index 70f3e965..d9eebc1b 100644
--- a/chrome/browser/web_applications/components/web_app_shortcuts_menu_win.cc
+++ b/chrome/browser/web_applications/components/web_app_shortcuts_menu_win.cc
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h
index 4036463..a965a20 100644
--- a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h
+++ b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_WEB_APPLICATIONS_EXTENSIONS_WEB_APP_EXTENSION_SHORTCUT_H_
 
 #include <memory>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc
index 03c52b6..1b73eac3 100644
--- a/chrome/browser/web_applications/web_app_install_task.cc
+++ b/chrome/browser/web_applications/web_app_install_task.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 <string>
 #include <utility>
 
 #include "chrome/browser/web_applications/components/install_finalizer.h"
diff --git a/chrome/browser/win/chrome_elf_init_unittest.cc b/chrome/browser/win/chrome_elf_init_unittest.cc
index 2a4acd52..aed27ef 100644
--- a/chrome/browser/win/chrome_elf_init_unittest.cc
+++ b/chrome/browser/win/chrome_elf_init_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/win/chrome_elf_init.h"
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc
index 5ff3ab9e..45876ec2 100644
--- a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc
+++ b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc
index 8edbe8b..85d349b 100644
--- a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc
+++ b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/win/conflicts/enumerate_shell_extensions.h"
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/win/conflicts/module_info.cc b/chrome/browser/win/conflicts/module_info.cc
index e27f631..95ef59d 100644
--- a/chrome/browser/win/conflicts/module_info.cc
+++ b/chrome/browser/win/conflicts/module_info.cc
@@ -9,6 +9,7 @@
 #include <fileapi.h>
 
 #include <memory>
+#include <string>
 #include <tuple>
 
 #include "base/file_version_info.h"
diff --git a/chrome/browser/win/conflicts/module_info_util.h b/chrome/browser/win/conflicts/module_info_util.h
index be3a577..531bcc7 100644
--- a/chrome/browser/win/conflicts/module_info_util.h
+++ b/chrome/browser/win/conflicts/module_info_util.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_WIN_CONFLICTS_MODULE_INFO_UTIL_H_
 #define CHROME_BROWSER_WIN_CONFLICTS_MODULE_INFO_UTIL_H_
 
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/chrome/browser/win/conflicts/third_party_metrics_recorder.cc b/chrome/browser/win/conflicts/third_party_metrics_recorder.cc
index 626f6343..1102835 100644
--- a/chrome/browser/win/conflicts/third_party_metrics_recorder.cc
+++ b/chrome/browser/win/conflicts/third_party_metrics_recorder.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <string>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/win/settings_app_monitor.cc b/chrome/browser/win/settings_app_monitor.cc
index 72390ba..6adf0a3 100644
--- a/chrome/browser/win/settings_app_monitor.cc
+++ b/chrome/browser/win/settings_app_monitor.cc
@@ -6,6 +6,7 @@
 
 #include <wrl/client.h>
 
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
diff --git a/chrome/browser/win/settings_app_monitor.h b/chrome/browser/win/settings_app_monitor.h
index 735a95c..bdd7c8a 100644
--- a/chrome/browser/win/settings_app_monitor.h
+++ b/chrome/browser/win/settings_app_monitor.h
@@ -8,6 +8,7 @@
 #include <windows.h>
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"