2757472: Reland "Reland "[LSC] Remove base::string16 alias""

https://chromium-review.googlesource.com/c/chromium/src/+/2757472

chromium_src/chrome/browser/certificate_manager_model.h

@@ -12,7 +12,6 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/strings/string16.h"
 #include "net/cert/nss_cert_database.h"
 
 namespace content {

shell/browser/browser.h

@@ -12,7 +12,6 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/values.h"
 #include "gin/dictionary.h"

shell/browser/extended_web_contents_observer.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/observer_list.h"
-#include "base/strings/string16.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 

shell/browser/login_handler.cc

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "base/strings/string16.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "gin/arguments.h"
 #include "gin/dictionary.h"

shell/browser/native_window.h

@@ -15,7 +15,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/optional.h"
-#include "base/strings/string16.h"
 #include "base/supports_user_data.h"
 #include "base/values.h"
 #include "content/public/browser/desktop_media_id.h"

shell/browser/native_window_observer.h

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/observer_list_types.h"
-#include "base/strings/string16.h"
 #include "base/values.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"

shell/browser/notifications/notification.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 

shell/browser/notifications/win/notification_presenter_win.h

@@ -24,7 +24,6 @@
 #define SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
 
 #include "base/files/scoped_temp_dir.h"
-#include "base/strings/string16.h"
 #include "shell/browser/notifications/notification_presenter.h"
 
 class GURL;

shell/browser/serial/serial_chooser_controller.h

@@ -10,7 +10,6 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
 #include "content/public/browser/serial_chooser.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"

shell/browser/ui/cocoa/electron_menu_controller.h

@@ -11,7 +11,6 @@
 #include "base/callback.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
 
 namespace electron {
 class ElectronMenuModel;

shell/browser/ui/gtk/gtk_status_icon.h

@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "base/strings/string16.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/views/linux_ui/status_icon_linux.h"

shell/browser/ui/inspectable_web_contents_view.h

@@ -6,7 +6,6 @@
 #ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
 #define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
 
-#include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"
 
 class DevToolsContentsResizingStrategy;

shell/browser/ui/message_box.h

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/callback_forward.h"
-#include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace electron {

shell/browser/ui/views/global_menu_bar_x11.cc

@@ -8,7 +8,6 @@
 #include <glib-object.h>
 
 #include "base/logging.h"
-#include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"

shell/common/application_info.h

@@ -6,7 +6,6 @@
 #define SHELL_COMMON_APPLICATION_INFO_H_
 
 #if defined(OS_WIN)
-#include "base/strings/string16.h"
 #include "shell/browser/win/scoped_hstring.h"
 #endif
 

shell/common/keyboard_util.h

@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/strings/string16.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace electron {

shell/common/language_util.h

@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/strings/string16.h"
-
 namespace electron {
 
 // Return a list of user preferred languages from OS. The list doesn't include

shell/common/platform_util.h

@@ -11,10 +11,6 @@
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include "base/strings/string16.h"
-#endif
-
 class GURL;
 
 namespace platform_util {

shell/renderer/electron_render_frame_observer.h

@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/strings/string16.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "ipc/ipc_platform_file.h"
 #include "shell/renderer/renderer_client_base.h"