Convert C++ files to Objective-C++ files to remove hack.

In order to remove hack using __OBJC__ to forward-declare an Objective-C
class as a C++ class when the file is included from a C++ file, instead
convert the clients to be Objective-C++ files.

This fixes all clients of
ios/public/provider/chrome/browser/chrome_browser_provider.h.

BUG=298181

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

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

21 files changed, 35 insertions, 39 deletions

diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index fea7bef1..704811e 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -36,8 +36,8 @@ source_set("browser") {
     "autocomplete/autocomplete_scheme_classifier_impl.mm",
     "autocomplete/in_memory_url_index_factory.cc",
     "autocomplete/in_memory_url_index_factory.h",
-    "autocomplete/shortcuts_backend_factory.cc",
     "autocomplete/shortcuts_backend_factory.h",
+    "autocomplete/shortcuts_backend_factory.mm",
     "autofill/form_input_accessory_view.h",
     "autofill/form_input_accessory_view.mm",
     "autofill/form_input_accessory_view_controller.h",
@@ -129,8 +129,8 @@ source_set("browser") {
     "dom_distiller/dom_distiller_service_factory.h",
     "experimental_flags.h",
     "experimental_flags.mm",
-    "favicon/favicon_client_impl.cc",
     "favicon/favicon_client_impl.h",
+    "favicon/favicon_client_impl.mm",
     "favicon/favicon_loader.h",
     "favicon/favicon_loader.mm",
     "favicon/favicon_service_factory.cc",
@@ -228,8 +228,8 @@ source_set("browser") {
     "metrics/ios_chrome_metrics_service_accessor.h",
     "metrics/ios_chrome_metrics_service_client.cc",
     "metrics/ios_chrome_metrics_service_client.h",
-    "metrics/ios_chrome_metrics_services_manager_client.cc",
     "metrics/ios_chrome_metrics_services_manager_client.h",
+    "metrics/ios_chrome_metrics_services_manager_client.mm",
     "metrics/ios_chrome_stability_metrics_provider.cc",
     "metrics/ios_chrome_stability_metrics_provider.h",
     "metrics/mobile_session_shutdown_metrics_provider.h",
@@ -315,8 +315,8 @@ source_set("browser") {
     "services/gcm/ios_chrome_gcm_profile_service_factory.h",
     "sessions/ios_chrome_session_tab_helper.h",
     "sessions/ios_chrome_session_tab_helper.mm",
-    "sessions/ios_chrome_tab_restore_service_client.cc",
     "sessions/ios_chrome_tab_restore_service_client.h",
+    "sessions/ios_chrome_tab_restore_service_client.mm",
     "sessions/ios_chrome_tab_restore_service_factory.cc",
     "sessions/ios_chrome_tab_restore_service_factory.h",
     "signin/about_signin_internals_factory.cc",
@@ -342,12 +342,12 @@ source_set("browser") {
     "signin/gaia_cookie_manager_service_factory.h",
     "signin/ios_chrome_signin_status_metrics_provider_delegate.cc",
     "signin/ios_chrome_signin_status_metrics_provider_delegate.h",
-    "signin/oauth2_token_service_factory.cc",
     "signin/oauth2_token_service_factory.h",
+    "signin/oauth2_token_service_factory.mm",
     "signin/signin_client_factory.cc",
     "signin/signin_client_factory.h",
-    "signin/signin_client_impl.cc",
     "signin/signin_client_impl.h",
+    "signin/signin_client_impl.mm",
     "signin/signin_error_controller_factory.cc",
     "signin/signin_error_controller_factory.h",
     "signin/signin_manager_factory.cc",
@@ -377,8 +377,8 @@ source_set("browser") {
     "sync/glue/sync_start_util.h",
     "sync/ios_chrome_profile_sync_service_factory.cc",
     "sync/ios_chrome_profile_sync_service_factory.h",
-    "sync/ios_chrome_sync_client.cc",
     "sync/ios_chrome_sync_client.h",
+    "sync/ios_chrome_sync_client.mm",
     "sync/ios_chrome_synced_tab_delegate.h",
     "sync/ios_chrome_synced_tab_delegate.mm",
     "sync/sessions/ios_chrome_local_session_event_router.h",
@@ -700,8 +700,8 @@ if (enable_rlz_support) {
 source_set("test_support") {
   testonly = true
   sources = [
-    "browser_state/test_chrome_browser_state.cc",
     "browser_state/test_chrome_browser_state.h",
+    "browser_state/test_chrome_browser_state.mm",
     "browser_state/test_chrome_browser_state_isolated_context.h",
     "browser_state/test_chrome_browser_state_isolated_context.mm",
     "browser_state/test_chrome_browser_state_manager.c",
@@ -711,8 +711,8 @@ source_set("test_support") {
     "geolocation/test_location_manager.mm",
     "net/mock_image_fetcher.h",
     "net/mock_image_fetcher.mm",
-    "signin/fake_oauth2_token_service_builder.cc",
     "signin/fake_oauth2_token_service_builder.h",
+    "signin/fake_oauth2_token_service_builder.mm",
     "signin/fake_signin_manager_builder.cc",
     "signin/fake_signin_manager_builder.h",
     "sync/fake_sync_service_factory.cc",
diff --git a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm
index 8d33e86e..8d33e86e 100644
--- a/ios/chrome/browser/autocomplete/shortcuts_backend_factory.cc
+++ b/ios/chrome/browser/autocomplete/shortcuts_backend_factory.mm
diff --git a/ios/chrome/browser/browser_state/test_chrome_browser_state.cc b/ios/chrome/browser/browser_state/test_chrome_browser_state.mm
index 236bf2b..236bf2b 100644
--- a/ios/chrome/browser/browser_state/test_chrome_browser_state.cc
+++ b/ios/chrome/browser/browser_state/test_chrome_browser_state.mm
diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
index ac900f8..ac900f8 100644
--- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc
+++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
diff --git a/ios/chrome/browser/favicon/favicon_client_impl.cc b/ios/chrome/browser/favicon/favicon_client_impl.mm
index 3dbb5ce..a35e4b2 100644
--- a/ios/chrome/browser/favicon/favicon_client_impl.cc
+++ b/ios/chrome/browser/favicon/favicon_client_impl.mm
@@ -27,8 +27,7 @@ void RunFaviconCallbackIfNotCanceled(
 FaviconClientImpl::FaviconClientImpl(ios::ChromeBrowserState* browser_state)
     : browser_state_(browser_state) {}
 
-FaviconClientImpl::~FaviconClientImpl() {
-}
+FaviconClientImpl::~FaviconClientImpl() {}
 
 bool FaviconClientImpl::IsNativeApplicationURL(const GURL& url) {
   return url.SchemeIs(kChromeUIScheme);
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm
index 5c94899..5c94899 100644
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.cc
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm
diff --git a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.cc b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm
index 9873924..9873924 100644
--- a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.cc
+++ b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm
diff --git a/ios/chrome/browser/signin/fake_oauth2_token_service_builder.cc b/ios/chrome/browser/signin/fake_oauth2_token_service_builder.mm
index edb2800..edb2800 100644
--- a/ios/chrome/browser/signin/fake_oauth2_token_service_builder.cc
+++ b/ios/chrome/browser/signin/fake_oauth2_token_service_builder.mm
diff --git a/ios/chrome/browser/signin/oauth2_token_service_factory.cc b/ios/chrome/browser/signin/oauth2_token_service_factory.mm
index 63de60a..63de60a 100644
--- a/ios/chrome/browser/signin/oauth2_token_service_factory.cc
+++ b/ios/chrome/browser/signin/oauth2_token_service_factory.mm
diff --git a/ios/chrome/browser/signin/signin_client_impl.cc b/ios/chrome/browser/signin/signin_client_impl.mm
index 18dd10e6..e3d7639 100644
--- a/ios/chrome/browser/signin/signin_client_impl.cc
+++ b/ios/chrome/browser/signin/signin_client_impl.mm
@@ -53,8 +53,7 @@ void SigninClientImpl::Shutdown() {
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
-void SigninClientImpl::DoFinalInit() {
-}
+void SigninClientImpl::DoFinalInit() {}
 
 // static
 bool SigninClientImpl::AllowsSigninCookies(
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.cc b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
index 999534e..262a7d6 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.cc
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
@@ -70,8 +70,8 @@ class SyncSessionsClientImpl : public sync_sessions::SyncSessionsClient {
   explicit SyncSessionsClientImpl(ios::ChromeBrowserState* browser_state)
       : browser_state_(browser_state),
         window_delegates_getter_(
-            ios::GetChromeBrowserProvider()
-                ->CreateSyncedWindowDelegatesGetter(browser_state)) {}
+            ios::GetChromeBrowserProvider()->CreateSyncedWindowDelegatesGetter(
+                browser_state)) {}
 
   ~SyncSessionsClientImpl() override {}
 
diff --git a/ios/chrome/ios_chrome.gyp b/ios/chrome/ios_chrome.gyp
index 9ad6c88..749815a 100644
--- a/ios/chrome/ios_chrome.gyp
+++ b/ios/chrome/ios_chrome.gyp
@@ -169,8 +169,8 @@
         'browser/autocomplete/autocomplete_scheme_classifier_impl.mm',
         'browser/autocomplete/in_memory_url_index_factory.cc',
         'browser/autocomplete/in_memory_url_index_factory.h',
-        'browser/autocomplete/shortcuts_backend_factory.cc',
         'browser/autocomplete/shortcuts_backend_factory.h',
+        'browser/autocomplete/shortcuts_backend_factory.mm',
         'browser/autofill/form_input_accessory_view.h',
         'browser/autofill/form_input_accessory_view.mm',
         'browser/autofill/form_input_accessory_view_controller.h',
@@ -222,8 +222,8 @@
         'browser/browser_state/off_the_record_chrome_browser_state_io_data.mm',
         'browser/browser_state_metrics/browser_state_metrics.cc',
         'browser/browser_state_metrics/browser_state_metrics.h',
-        'browser/browsing_data/ios_chrome_browsing_data_remover.cc',
         'browser/browsing_data/ios_chrome_browsing_data_remover.h',
+        'browser/browsing_data/ios_chrome_browsing_data_remover.mm',
         'browser/browsing_data_change_listening.h',
         'browser/chrome_constants.cc',
         'browser/chrome_constants.h',
@@ -268,8 +268,8 @@
         'browser/dom_distiller/dom_distiller_service_factory.h',
         'browser/experimental_flags.h',
         'browser/experimental_flags.mm',
-        'browser/favicon/favicon_client_impl.cc',
         'browser/favicon/favicon_client_impl.h',
+        'browser/favicon/favicon_client_impl.mm',
         'browser/favicon/favicon_loader.h',
         'browser/favicon/favicon_loader.mm',
         'browser/favicon/favicon_service_factory.cc',
@@ -369,8 +369,8 @@
         'browser/metrics/ios_chrome_metrics_service_accessor.h',
         'browser/metrics/ios_chrome_metrics_service_client.cc',
         'browser/metrics/ios_chrome_metrics_service_client.h',
-        'browser/metrics/ios_chrome_metrics_services_manager_client.cc',
         'browser/metrics/ios_chrome_metrics_services_manager_client.h',
+        'browser/metrics/ios_chrome_metrics_services_manager_client.mm',
         'browser/metrics/ios_chrome_stability_metrics_provider.cc',
         'browser/metrics/ios_chrome_stability_metrics_provider.h',
         'browser/metrics/mobile_session_shutdown_metrics_provider.h',
@@ -470,8 +470,8 @@
         'browser/services/gcm/ios_chrome_gcm_profile_service_factory.h',
         'browser/sessions/ios_chrome_session_tab_helper.h',
         'browser/sessions/ios_chrome_session_tab_helper.mm',
-        'browser/sessions/ios_chrome_tab_restore_service_client.cc',
         'browser/sessions/ios_chrome_tab_restore_service_client.h',
+        'browser/sessions/ios_chrome_tab_restore_service_client.mm',
         'browser/sessions/ios_chrome_tab_restore_service_factory.cc',
         'browser/sessions/ios_chrome_tab_restore_service_factory.h',
         'browser/signin/about_signin_internals_factory.cc',
@@ -497,12 +497,12 @@
         'browser/signin/gaia_cookie_manager_service_factory.h',
         'browser/signin/ios_chrome_signin_status_metrics_provider_delegate.cc',
         'browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h',
-        'browser/signin/oauth2_token_service_factory.cc',
         'browser/signin/oauth2_token_service_factory.h',
+        'browser/signin/oauth2_token_service_factory.mm',
         'browser/signin/signin_client_factory.cc',
         'browser/signin/signin_client_factory.h',
-        'browser/signin/signin_client_impl.cc',
         'browser/signin/signin_client_impl.h',
+        'browser/signin/signin_client_impl.mm',
         'browser/signin/signin_error_controller_factory.cc',
         'browser/signin/signin_error_controller_factory.h',
         'browser/signin/signin_manager_factory.cc',
@@ -532,8 +532,8 @@
         'browser/sync/glue/sync_start_util.h',
         'browser/sync/ios_chrome_profile_sync_service_factory.cc',
         'browser/sync/ios_chrome_profile_sync_service_factory.h',
-        'browser/sync/ios_chrome_sync_client.cc',
         'browser/sync/ios_chrome_sync_client.h',
+        'browser/sync/ios_chrome_sync_client.mm',
         'browser/sync/ios_chrome_synced_tab_delegate.h',
         'browser/sync/ios_chrome_synced_tab_delegate.mm',
         'browser/sync/sessions/ios_chrome_local_session_event_router.h',
diff --git a/ios/chrome/ios_chrome_tests.gyp b/ios/chrome/ios_chrome_tests.gyp
index d72f00e..eb1f883 100644
--- a/ios/chrome/ios_chrome_tests.gyp
+++ b/ios/chrome/ios_chrome_tests.gyp
@@ -115,8 +115,8 @@
         'ios_chrome.gyp:ios_chrome_browser',
       ],
       'sources': [
-        'browser/browser_state/test_chrome_browser_state.cc',
         'browser/browser_state/test_chrome_browser_state.h',
+        'browser/browser_state/test_chrome_browser_state.mm',
         'browser/browser_state/test_chrome_browser_state_isolated_context.h',
         'browser/browser_state/test_chrome_browser_state_isolated_context.mm',
         'browser/browser_state/test_chrome_browser_state_manager.cc',
@@ -126,8 +126,8 @@
         'browser/geolocation/test_location_manager.mm',
         'browser/net/mock_image_fetcher.h',
         'browser/net/mock_image_fetcher.mm',
-        'browser/signin/fake_oauth2_token_service_builder.cc',
         'browser/signin/fake_oauth2_token_service_builder.h',
+        'browser/signin/fake_oauth2_token_service_builder.mm',
         'browser/signin/fake_signin_manager_builder.cc',
         'browser/signin/fake_signin_manager_builder.h',
         'browser/sync/fake_sync_service_factory.cc',
@@ -138,15 +138,15 @@
         'browser/sync/sync_setup_service_mock.h',
         'test/block_cleanup_test.h',
         'test/block_cleanup_test.mm',
-        'test/ios_chrome_scoped_testing_chrome_browser_provider.cc',
         'test/ios_chrome_scoped_testing_chrome_browser_provider.h',
+        'test/ios_chrome_scoped_testing_chrome_browser_provider.mm',
         'test/ios_chrome_scoped_testing_local_state.cc',
         'test/ios_chrome_scoped_testing_local_state.h',
-        'test/ios_chrome_unit_test_suite.cc',
         'test/ios_chrome_unit_test_suite.h',
+        'test/ios_chrome_unit_test_suite.mm',
         'test/run_all_unittests.cc',
-        'test/testing_application_context.cc',
         'test/testing_application_context.h',
+        'test/testing_application_context.mm',
       ],
     },
   ],
diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn
index 24b1f15..0d635db 100644
--- a/ios/chrome/test/BUILD.gn
+++ b/ios/chrome/test/BUILD.gn
@@ -7,15 +7,15 @@ source_set("test") {
   sources = [
     "block_cleanup_test.h",
     "block_cleanup_test.mm",
-    "ios_chrome_scoped_testing_chrome_browser_provider.cc",
     "ios_chrome_scoped_testing_chrome_browser_provider.h",
+    "ios_chrome_scoped_testing_chrome_browser_provider.mm",
     "ios_chrome_scoped_testing_local_state.cc",
     "ios_chrome_scoped_testing_local_state.h",
-    "ios_chrome_unit_test_suite.cc",
     "ios_chrome_unit_test_suite.h",
+    "ios_chrome_unit_test_suite.mm",
     "run_all_unittests.cc",
-    "testing_application_context.cc",
     "testing_application_context.h",
+    "testing_application_context.mm",
   ]
 
   deps = [
diff --git a/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.cc b/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.mm
index 8d71507..8d71507 100644
--- a/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.cc
+++ b/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.mm
diff --git a/ios/chrome/test/ios_chrome_unit_test_suite.cc b/ios/chrome/test/ios_chrome_unit_test_suite.mm
index 6dc150b..203d2f2 100644
--- a/ios/chrome/test/ios_chrome_unit_test_suite.cc
+++ b/ios/chrome/test/ios_chrome_unit_test_suite.mm
@@ -61,11 +61,9 @@ class IOSChromeUnitTestSuiteInitializer
 }  // namespace
 
 IOSChromeUnitTestSuite::IOSChromeUnitTestSuite(int argc, char** argv)
-    : base::TestSuite(argc, argv) {
-}
+    : base::TestSuite(argc, argv) {}
 
-IOSChromeUnitTestSuite::~IOSChromeUnitTestSuite() {
-}
+IOSChromeUnitTestSuite::~IOSChromeUnitTestSuite() {}
 
 void IOSChromeUnitTestSuite::Initialize() {
   // Add an additional listener to do the extra initialization for unit tests.
diff --git a/ios/chrome/test/testing_application_context.cc b/ios/chrome/test/testing_application_context.mm
index 4fa943f..4fa943f 100644
--- a/ios/chrome/test/testing_application_context.cc
+++ b/ios/chrome/test/testing_application_context.mm
diff --git a/ios/provider/ios_provider_chrome.gyp b/ios/provider/ios_provider_chrome.gyp
index fba6bae..a53a68d 100644
--- a/ios/provider/ios_provider_chrome.gyp
+++ b/ios/provider/ios_provider_chrome.gyp
@@ -13,8 +13,8 @@
       'sources': [
         '../public/provider/chrome/browser/browser_constants.cc',
         '../public/provider/chrome/browser/browser_constants.h',
-        '../public/provider/chrome/browser/chrome_browser_provider.cc',
         '../public/provider/chrome/browser/chrome_browser_provider.h',
+        '../public/provider/chrome/browser/chrome_browser_provider.mm',
         '../public/provider/chrome/browser/geolocation_updater_provider.h',
         '../public/provider/chrome/browser/geolocation_updater_provider.mm',
         '../public/provider/chrome/browser/signin/chrome_identity.h',
@@ -50,8 +50,8 @@
       'sources': [
         '../public/provider/chrome/browser/test_chrome_browser_provider.h',
         '../public/provider/chrome/browser/test_chrome_browser_provider.mm',
-        '../public/provider/chrome/browser/test_chrome_provider_initializer.cc',
         '../public/provider/chrome/browser/test_chrome_provider_initializer.h',
+        '../public/provider/chrome/browser/test_chrome_provider_initializer.mm',
         '../public/provider/chrome/browser/test_updatable_resource_provider.h',
         '../public/provider/chrome/browser/test_updatable_resource_provider.mm',
       ],
diff --git a/ios/public/provider/chrome/browser/BUILD.gn b/ios/public/provider/chrome/browser/BUILD.gn
index 93f9778..f399afa5 100644
--- a/ios/public/provider/chrome/browser/BUILD.gn
+++ b/ios/public/provider/chrome/browser/BUILD.gn
@@ -4,8 +4,8 @@
 
 source_set("browser") {
   sources = [
-    "chrome_browser_provider.cc",
     "chrome_browser_provider.h",
+    "chrome_browser_provider.mm",
     "geolocation_updater_provider.h",
     "geolocation_updater_provider.mm",
     "signin/chrome_identity.h",
@@ -38,8 +38,8 @@ source_set("test_support") {
   sources = [
     "test_chrome_browser_provider.h",
     "test_chrome_browser_provider.mm",
-    "test_chrome_provider_initializer.cc",
     "test_chrome_provider_initializer.h",
+    "test_chrome_provider_initializer.mm",
     "test_updatable_resource_provider.h",
     "test_updatable_resource_provider.mm",
   ]
diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.cc b/ios/public/provider/chrome/browser/chrome_browser_provider.mm
index 3254f1f..3254f1f 100644
--- a/ios/public/provider/chrome/browser/chrome_browser_provider.cc
+++ b/ios/public/provider/chrome/browser/chrome_browser_provider.mm
diff --git a/ios/public/provider/chrome/browser/test_chrome_provider_initializer.cc b/ios/public/provider/chrome/browser/test_chrome_provider_initializer.mm
index 60455c1..60455c1 100644
--- a/ios/public/provider/chrome/browser/test_chrome_provider_initializer.cc
+++ b/ios/public/provider/chrome/browser/test_chrome_provider_initializer.mm