Remove/replace unnecessary logging.h includes in .mm files (misc dirs)

CHECK, CHECK_EQ etc., and NOTREACHED/NOTIMPLEMENTED have moved
to the much smaller headers check.h, check_op.h, and notreached.h,
respectively.

This CL updates .mm files to use those headers instead when
possible, with the purpose of saving compile time.

(See https://crrev.com/c/2164525 for how the change was generated.)

AX-Relnotes: n/a
Bug: 1031540
Change-Id: I5fdba43cc002b236ef8497e8b3ef9312f5282a6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2196162
Auto-Submit: Hans Wennborg <hans@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Camille Lamy <clamy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768820}

This commit is contained in:

Hans Wennborg

2020-05-14 17:30:50 +00:00

committed by

Commit Bot

parent c83d0317bb

commit da08b7363d

60 changed files with 62 additions and 60 deletions

components

autofill

core

browser

keyboard_accessory_metrics_logger.mm

ios

browser

credit_card_save_manager_test_observer_bridge.mm js_autofill_manager.mm js_suggestion_manager.mm personal_data_manager_observer_bridge.mm

form_util

form_activity_observer_bridge.mm

crash

core

app

crashpad_mac.mm

common

objc_zombie_unittest.mm

handoff

handoff_manager.mm

history

ios

browser

web_state_top_sites_observer.mm

language

ios

browser

ios_language_detection_tab_helper_observer_bridge.mm

nacl

loader

nacl_main_platform_delegate_mac.mm

open_from_clipboard

clipboard_recent_content_ios.mm

password_manager

ios

js_password_manager.mm

policy

core

common

policy_loader_ios.mm

printing

browser

printer_capabilities_mac.mm

renderer

print_render_frame_helper_mac.mm

remote_cocoa

app_shim

bridged_content_view.mm mouse_capture.mm ns_view_ids.mm views_nswindow_delegate.mm

security_state

ios

insecure_input_tab_helper.mm

services

quarantine

quarantine_mac_unittest.mm

signin

ios

browser

active_state_manager_impl.mm

public

identity_manager

ios

fake_device_accounts_provider.mm

spellcheck

browser

spellcheck_platform_mac.mm

translate

ios

browser

ios_translate_driver.mm js_translate_manager.mm language_detection_controller.mm translate_controller.mm

content

browser

accessibility

browser_accessibility_cocoa_browsertest.mm browser_accessibility_manager_mac.mm

sandbox_parameters_mac.mm

common

cursors

webcursor_mac.mm

mac

attributed_string_coder.mm

renderer

renderer_main_platform_delegate_mac.mm

shell

app

shell_main_delegate_mac.mm

browser

shell_platform_delegate_mac.mm

device

bluetooth

bluetooth_channel_mac.mm bluetooth_l2cap_channel_mac.mm bluetooth_rfcomm_channel_mac.mm

fido

mac

scoped_touch_id_test_environment.mm

gamepad

xbox_controller_mac.mm

extensions/shell/browser

shell_native_app_window_mac.mm

google_apis

google_api_keys_mac_unittest.mm

net/base

net_string_util_icu_alternatives_ios.mm

printing

printing_context_mac.mm

remoting

host

continue_window_mac.mm

ios

app

app_delegate.mm app_view_controller_chromium.mm notification_dialog_view_controller.mm notification_presenter.mm

settings

remoting_settings_view_controller.mm

display

eagl_view.mm gl_demo_screen.mm

facade

ios_client_runtime_delegate.mm remoting_service.mm

persistence

remoting_preferences.mm

rlz/mac/lib

rlz_value_store_mac.mm

skia/ext

skia_utils_mac.mm

2

components/autofill/core/browser/keyboard_accessory_metrics_logger.mm

 @ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/metrics/histogram_macros.h"
 namespace autofill {

2

components/autofill/ios/browser/credit_card_save_manager_test_observer_bridge.mm

 @ -4,7 +4,7 @@
 #import "components/autofill/ios/browser/credit_card_save_manager_test_observer_bridge.h"
 #include "base/logging.h"
 #include "base/check.h"
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

2

components/autofill/ios/browser/js_autofill_manager.mm

 @ -8,12 +8,12 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/check.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"

2

components/autofill/ios/browser/js_suggestion_manager.mm

 @ -8,9 +8,9 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/check.h"
 #include "base/format_macros.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #import "components/autofill/ios/browser/autofill_util.h"

2

components/autofill/ios/browser/personal_data_manager_observer_bridge.mm

 @ -4,7 +4,7 @@
 #import "components/autofill/ios/browser/personal_data_manager_observer_bridge.h"
 #include "base/logging.h"
 #include "base/check.h"
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

2

components/autofill/ios/form_util/form_activity_observer_bridge.mm

 @ -4,7 +4,7 @@
 #include "components/autofill/ios/form_util/form_activity_observer_bridge.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "components/autofill/ios/form_util/form_activity_tab_helper.h"
 #if !defined(__has_feature) || !__has_feature(objc_arc)

2

components/crash/core/app/crashpad_mac.mm

 @ -12,8 +12,8 @@
 #include <map>
 #include <vector>
 #include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"

1

components/crash/core/common/objc_zombie_unittest.mm

 @ -5,7 +5,6 @@
 #import <Foundation/Foundation.h>
 #include <objc/runtime.h>
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #import "components/crash/core/common/objc_zombie.h"
 #include "testing/gtest/include/gtest/gtest.h"

3

components/handoff/handoff_manager.mm

 @ -4,9 +4,10 @@
 #include "components/handoff/handoff_manager.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/objc_release_properties.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/notreached.h"
 #include "net/base/mac/url_conversions.h"
 #if defined(OS_IOS)

2

components/history/ios/browser/web_state_top_sites_observer.mm

 @ -4,7 +4,7 @@
 #include "components/history/ios/browser/web_state_top_sites_observer.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/memory/ptr_util.h"
 #include "components/history/core/browser/top_sites.h"
 #import "ios/web/public/navigation/navigation_context.h"

2

components/language/ios/browser/ios_language_detection_tab_helper_observer_bridge.mm

 @ -4,7 +4,7 @@
 #import "components/language/ios/browser/ios_language_detection_tab_helper_observer_bridge.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

1

components/nacl/loader/nacl_main_platform_delegate_mac.mm

 @ -7,7 +7,6 @@
 #import <Cocoa/Cocoa.h>
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/common/sandbox_init.h"
 #include "sandbox/mac/seatbelt.h"

2

components/open_from_clipboard/clipboard_recent_content_ios.mm

 @ -9,8 +9,8 @@
 #include <stdint.h>
 #import <UIKit/UIKit.h>
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "base/notreached.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/system/sys_info.h"

2

components/password_manager/ios/js_password_manager.mm

 @ -4,9 +4,9 @@
 #import "components/password_manager/ios/js_password_manager.h"
 #include "base/check.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"

2

components/policy/core/common/policy_loader_ios.mm

 @ -9,9 +9,9 @@
 #import <UIKit/UIKit.h>
 #include "base/bind.h"
 #include "base/check.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sequenced_task_runner.h"

2

components/printing/browser/printer_capabilities_mac.mm

 @ -6,8 +6,8 @@
 #import <AppKit/AppKit.h>
 #include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"

2

components/printing/renderer/print_render_frame_helper_mac.mm

 @ -8,7 +8,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/metrics/histogram.h"
 #include "cc/paint/paint_canvas.h"

3

components/remote_cocoa/app_shim/bridged_content_view.mm

 @ -4,11 +4,12 @@
 #import "components/remote_cocoa/app_shim/bridged_content_view.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/notreached.h"
 #include "base/strings/sys_string_conversions.h"
 #import "components/remote_cocoa/app_shim/drag_drop_client.h"
 #import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"

2

components/remote_cocoa/app_shim/mouse_capture.mm

 @ -6,7 +6,7 @@
 #import <Cocoa/Cocoa.h>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/macros.h"
 #import "components/remote_cocoa/app_shim/mouse_capture_delegate.h"
 #include "ui/base/cocoa/weak_ptr_nsobject.h"

2

components/remote_cocoa/app_shim/ns_view_ids.mm

 @ -8,7 +8,7 @@
 #include <map>
 #include <utility>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/no_destructor.h"
 namespace remote_cocoa {

2

components/remote_cocoa/app_shim/views_nswindow_delegate.mm

 @ -5,7 +5,7 @@
 #import "components/remote_cocoa/app_shim/views_nswindow_delegate.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/mac_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #import "components/remote_cocoa/app_shim/bridged_content_view.h"

2

components/security_state/ios/insecure_input_tab_helper.mm

 @ -8,7 +8,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "components/autofill/ios/form_util/form_activity_params.h"
 #include "components/autofill/ios/form_util/form_activity_tab_helper.h"
 #include "components/security_state/ios/ssl_status_input_event_data.h"

1

components/services/quarantine/quarantine_mac_unittest.mm

 @ -12,7 +12,6 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"

2

components/signin/ios/browser/active_state_manager_impl.mm

 @ -4,7 +4,7 @@
 #include "components/signin/ios/browser/active_state_manager_impl.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/memory/ptr_util.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/thread/web_thread.h"

2

components/signin/public/identity_manager/ios/fake_device_accounts_provider.mm

 @ -6,7 +6,7 @@
 #import <Foundation/Foundation.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/strings/sys_string_conversions.h"
 #if !defined(__has_feature) || !__has_feature(objc_arc)

3

components/spellcheck/browser/spellcheck_platform_mac.mm

 @ -10,8 +10,9 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/foundation_util.h"
 #include "base/notreached.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/time/time.h"
 #include "components/spellcheck/common/spellcheck_common.h"

2

components/translate/ios/browser/ios_translate_driver.mm

 @ -5,7 +5,7 @@
 #include "components/translate/ios/browser/ios_translate_driver.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"

2

components/translate/ios/browser/js_translate_manager.mm

 @ -8,7 +8,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/bundle_locations.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"

3

components/translate/ios/browser/language_detection_controller.mm

 @ -7,8 +7,9 @@
 #include <string>
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/notreached.h"
 #include "base/time/time.h"
 #include "components/language/ios/browser/ios_language_detection_tab_helper.h"
 #include "components/prefs/pref_member.h"

2

components/translate/ios/browser/translate_controller.mm

 @ -8,8 +8,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/check_op.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"

2

content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm

 @ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_cocoa.h"

2

content/browser/accessibility/browser_accessibility_manager_mac.mm

 @ -5,8 +5,8 @@
 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
 #include "base/bind.h"
 #include "base/check.h"
 #include "base/location.h"
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"

2

content/browser/sandbox_parameters_mac.mm

 @ -6,10 +6,10 @@
 #include <unistd.h>
 #include "base/check.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"

3

content/common/cursors/webcursor_mac.mm

 @ -7,8 +7,9 @@
 #import <AppKit/AppKit.h>
 #include <stddef.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/notreached.h"
 #include "content/app/resources/grit/content_resources.h"
 #include "content/public/common/content_client.h"
 #include "skia/ext/skia_utils_mac.h"

2

content/common/mac/attributed_string_coder.mm

 @ -6,7 +6,7 @@
 #include <AppKit/AppKit.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"

2

content/renderer/renderer_main_platform_delegate_mac.mm

 @ -6,7 +6,7 @@
 #import <Cocoa/Cocoa.h>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "sandbox/mac/seatbelt.h"
 #include "sandbox/mac/system_services.h"

2

content/shell/app/shell_main_delegate_mac.mm

 @ -6,9 +6,9 @@
 #include <unistd.h>
 #include "base/check.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"

2

content/shell/browser/shell_platform_delegate_mac.mm

 @ -6,9 +6,9 @@
 #include <algorithm>
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/notreached.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"

2

device/bluetooth/bluetooth_channel_mac.mm

 @ -6,7 +6,7 @@
 #import <IOBluetooth/IOBluetooth.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "device/bluetooth/bluetooth_classic_device_mac.h"
 namespace device {

2

device/bluetooth/bluetooth_l2cap_channel_mac.mm

 @ -6,7 +6,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "device/bluetooth/bluetooth_classic_device_mac.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"

2

device/bluetooth/bluetooth_rfcomm_channel_mac.mm

 @ -6,7 +6,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "device/bluetooth/bluetooth_classic_device_mac.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"

2

device/fido/mac/scoped_touch_id_test_environment.mm

 @ -6,7 +6,7 @@
 #import <Security/Security.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/memory/ptr_util.h"
 #include "device/fido/mac/authenticator_config.h"
 #include "device/fido/mac/fake_keychain.h"

2

device/gamepad/xbox_controller_mac.mm

 @ -17,8 +17,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/check_op.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/sequenced_task_runner.h"

2

extensions/shell/browser/shell_native_app_window_mac.mm

 @ -6,8 +6,8 @@
 #import <Cocoa/Cocoa.h>
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/notreached.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/display/display.h"

1

google_apis/google_api_keys_mac_unittest.mm

 @ -32,7 +32,6 @@
 #include <string>
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/stringize_macros.h"
 #include "google_apis/google_api_keys_mac.h"

2

net/base/net_string_util_icu_alternatives_ios.mm

 @ -4,7 +4,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string16.h"

2

printing/printing_context_mac.mm

 @ -10,7 +10,7 @@
 #import <iomanip>
 #import <numeric>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"

2

remoting/host/continue_window_mac.mm

 @ -8,8 +8,8 @@
 #import <Cocoa/Cocoa.h>
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"

3

remoting/ios/app/app_delegate.mm

 @ -24,7 +24,8 @@
 #import "remoting/ios/facade/remoting_oauth_authentication.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/notreached.h"
 #include "remoting/base/string_resources.h"
 #include "remoting/ios/app/notification_presenter.h"
 #include "ui/base/l10n/l10n_util.h"

1

remoting/ios/app/app_view_controller_chromium.mm

 @ -8,7 +8,6 @@
 #import "remoting/ios/app/app_view_controller.h"
 #include "base/logging.h"
 #import "remoting/ios/app/remoting_menu_view_controller.h"

2

remoting/ios/app/notification_dialog_view_controller.mm

 @ -14,7 +14,7 @@
 #include <algorithm>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/strings/string_split.h"
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/base/string_resources.h"

2

remoting/ios/app/notification_presenter.mm

 @ -15,7 +15,7 @@
 #import "remoting/ios/persistence/remoting_preferences.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "remoting/base/string_resources.h"

2

remoting/ios/app/settings/remoting_settings_view_controller.mm

 @ -16,7 +16,7 @@
 #import "remoting/ios/app/settings/settings_view_cell.h"
 #import "remoting/ios/app/view_utils.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "remoting/base/string_resources.h"
 #include "ui/base/l10n/l10n_util.h"

2

remoting/ios/display/eagl_view.mm

 @ -15,7 +15,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/check_op.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"

2

remoting/ios/display/gl_demo_screen.mm

 @ -4,7 +4,7 @@
 #include "remoting/ios/display/gl_demo_screen.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "remoting/client/display/canvas.h"
 #include "remoting/client/display/gl_math.h"

2

remoting/ios/facade/ios_client_runtime_delegate.mm

 @ -12,7 +12,7 @@
 #import "remoting/ios/facade/remoting_service.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"

2

remoting/ios/facade/remoting_service.mm

 @ -15,7 +15,7 @@
 #import "remoting/ios/facade/ios_client_runtime_delegate.h"
 #import "remoting/ios/facade/remoting_authentication.h"
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/strings/sys_string_conversions.h"
 NSString* const kUserDidUpdate = @"kUserDidUpdate";

2

remoting/ios/persistence/remoting_preferences.mm

 @ -11,7 +11,7 @@
 #import "remoting/ios/domain/host_info.h"
 #import "remoting/ios/domain/host_settings.h"
 #include "base/logging.h"
 #include "base/check.h"
 static NSString* const kActiveUserKey = @"kActiveUserKey";
 static NSString* const kHostSettingsKey = @"kHostSettingsKey";

3

rlz/mac/lib/rlz_value_store_mac.mm

 @ -4,9 +4,10 @@
 #include "rlz/mac/lib/rlz_value_store_mac.h"
 #include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/notreached.h"
 #include "base/strings/sys_string_conversions.h"
 #include "rlz/lib/assert.h"
 #include "rlz/lib/lib_values.h"

2

skia/ext/skia_utils_mac.mm

 @ -9,7 +9,7 @@
 #include <memory>
 #include "base/logging.h"
 #include "base/check.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"