Fix include/import in ios/testing and ios/chrome/test

include -> import
+#import "base/ios/block_types.h"
+#import "base/mac/bind_objc_block.h"
+#import "base/mac/scoped_nsobject.h"
+#import "base/test/ios/wait_util.h"
+#import "ios/chrome/app/application_delegate/metrics_mediator.h"
+#import "ios/chrome/app/application_delegate/metrics_mediator_testing.h"
+#import "ios/chrome/browser/signin/authentication_service.h"
+#import "ios/chrome/browser/ui/uikit_ui_util.h"
+#import "ios/chrome/test/app/histogram_test_util.h"
+#import "ios/chrome/test/app/history_test_util.h"
+#import "ios/chrome/test/base/perf_test_ios.h"
+#import "ios/chrome/test/block_cleanup_test.h"
+#import "ios/chrome/test/ocmock/scoped_mock_object.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/web/public/web_client.h"
+#import "ios/web/public/web_state/web_state.h"
+#import "testing/gtest_mac.h"
+#import <Foundation/Foundation.h>

import -> include
+#include "ios/chrome/test/app/bookmarks_test_util.h"
+#include "ios/chrome/test/app/settings_test_util.h"
+#include "ios/chrome/test/base/scoped_block_swizzler.h"
+#include "ios/chrome/test/earl_grey/accessibility_util.h"
+#include "ios/chrome/test/earl_grey/chrome_util.h"

Review-Url: https://codereview.chromium.org/2608733002
Cr-Commit-Position: refs/heads/master@{#440965}

ios/chrome/test/app/bookmarks_test_util.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.
 
-#import "ios/chrome/test/app/bookmarks_test_util.h"
+#include "ios/chrome/test/app/bookmarks_test_util.h"
 
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"

ios/chrome/test/app/chrome_test_util.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_TEST_APP_CHROME_TEST_UTIL_H_
 #define IOS_CHROME_TEST_APP_CHROME_TEST_UTIL_H_
 
-#include "base/ios/block_types.h"
+#import "base/ios/block_types.h"
 #import "ios/web/public/web_state/web_state.h"
 
 namespace ios {

ios/chrome/test/app/chrome_test_util.mm

@@ -8,8 +8,8 @@
 #import "breakpad/src/client/ios/BreakpadController.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
-#include "ios/chrome/app/application_delegate/metrics_mediator.h"
-#include "ios/chrome/app/application_delegate/metrics_mediator_testing.h"
+#import "ios/chrome/app/application_delegate/metrics_mediator.h"
+#import "ios/chrome/app/application_delegate/metrics_mediator_testing.h"
 #import "ios/chrome/app/chrome_overlay_window.h"
 #import "ios/chrome/app/main_application_delegate_testing.h"
 #import "ios/chrome/app/main_controller.h"

ios/chrome/test/app/histogram_test_util.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 "ios/chrome/test/app/histogram_test_util.h"
+#import "ios/chrome/test/app/histogram_test_util.h"
 
 #import <Foundation/Foundation.h>
 

ios/chrome/test/app/history_test_util.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_TEST_APP_HISTORY_TEST_UTIL_H_
 #define IOS_CHROME_TEST_APP_HISTORY_TEST_UTIL_H_
 
-#include "base/ios/block_types.h"
+#import "base/ios/block_types.h"
 
 namespace chrome_test_util {
 

ios/chrome/test/app/history_test_util.mm

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/chrome/test/app/history_test_util.h"
+#import "ios/chrome/test/app/history_test_util.h"
 
-#include "base/mac/bind_objc_block.h"
-#include "base/test/ios/wait_util.h"
+#import "base/mac/bind_objc_block.h"
+#import "base/test/ios/wait_util.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #import "ios/chrome/app/main_controller.h"
 #import "ios/chrome/app/main_controller_private.h"

ios/chrome/test/app/settings_test_util.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.
 
-#import "ios/chrome/test/app/settings_test_util.h"
+#include "ios/chrome/test/app/settings_test_util.h"
 
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h"

ios/chrome/test/app/signin_test_util.mm

@@ -6,18 +6,18 @@
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/ios/wait_util.h"
+#import "base/test/ios/wait_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/signin/account_tracker_service_factory.h"
-#include "ios/chrome/browser/signin/authentication_service.h"
+#import "ios/chrome/browser/signin/authentication_service.h"
 #include "ios/chrome/browser/signin/authentication_service_factory.h"
 #include "ios/chrome/browser/signin/gaia_auth_fetcher_ios.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
-#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"

ios/chrome/test/app/sync_test_util.mm

@@ -8,11 +8,11 @@
 #include <string>
 
 #include "base/logging.h"
-#include "base/mac/bind_objc_block.h"
+#import "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/test/ios/wait_util.h"
+#import "base/test/ios/wait_util.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/history/core/browser/history_service.h"

ios/chrome/test/base/perf_test_ios.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "base/ios/block_types.h"
+#import "base/ios/block_types.h"
 #include "base/time/time.h"
 #import "ios/chrome/test/block_cleanup_test.h"
 #include "ios/web/public/test/scoped_testing_web_client.h"

ios/chrome/test/base/perf_test_ios.mm

@@ -5,7 +5,7 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #import "ios/chrome/browser/web/chrome_web_client.h"
-#include "ios/chrome/test/base/perf_test_ios.h"
+#import "ios/chrome/test/base/perf_test_ios.h"
 
 PerfTest::PerfTest(std::string testGroup)
     : BlockCleanupTest(),

ios/chrome/test/base/scoped_block_swizzler.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.
 
-#import "ios/chrome/test/base/scoped_block_swizzler.h"
+#include "ios/chrome/test/base/scoped_block_swizzler.h"
 
 #include "base/logging.h"
 

ios/chrome/test/base/scoped_block_swizzler_unittest.mm

@@ -4,9 +4,9 @@
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
-#import "ios/chrome/test/base/scoped_block_swizzler.h"
+#include "ios/chrome/test/base/scoped_block_swizzler.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gtest_mac.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // Class containing two methods that will be swizzled by the unittests.

ios/chrome/test/block_cleanup_test.mm

@@ -4,10 +4,10 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ios/chrome/test/block_cleanup_test.h"
+#import "ios/chrome/test/block_cleanup_test.h"
 
 #include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 
 void BlockCleanupTest::SetUp() {
   block_cleanup_pool_ = [[NSAutoreleasePool alloc] init];

ios/chrome/test/earl_grey/accessibility_util.mm

@@ -5,7 +5,7 @@
 #import <EarlGrey/EarlGrey.h>
 #import <XCTest/XCTest.h>
 
-#import "ios/chrome/test/earl_grey/accessibility_util.h"
+#include "ios/chrome/test/earl_grey/accessibility_util.h"
 
 namespace {
 

ios/chrome/test/earl_grey/chrome_earl_grey.mm

@@ -9,13 +9,13 @@
 
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
-#include "ios/chrome/test/app/history_test_util.h"
+#import "ios/chrome/test/app/history_test_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/earl_grey/js_test_util.h"
 #import "ios/web/public/test/web_view_interaction_test_util.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
-#include "ios/web/public/web_state/web_state.h"
+#import "ios/web/public/web_state/web_state.h"
 
 namespace chrome_test_util {
 

ios/chrome/test/earl_grey/chrome_earl_grey_ui.mm

@@ -5,7 +5,7 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h"
-#include "ios/chrome/browser/ui/uikit_ui_util.h"
+#import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"

ios/chrome/test/earl_grey/chrome_matchers.mm

@@ -10,7 +10,7 @@
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/test/ios/wait_util.h"
+#import "base/test/ios/wait_util.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"

ios/chrome/test/earl_grey/chrome_test_case.h

@@ -7,7 +7,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "base/ios/block_types.h"
+#import "base/ios/block_types.h"
 
 // Base class for all Chrome Earl Grey tests.
 @interface ChromeTestCase : XCTestCase

ios/chrome/test/earl_grey/chrome_test_case.mm

@@ -11,7 +11,7 @@
 #include "base/mac/scoped_block.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
-#import "ios/chrome/test/app/settings_test_util.h"
+#include "ios/chrome/test/app/settings_test_util.h"
 #include "ios/chrome/test/app/signin_test_util.h"
 #import "ios/chrome/test/app/sync_test_util.h"
 #import "ios/chrome/test/app/tab_test_util.h"

ios/chrome/test/earl_grey/chrome_util.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.
 
-#import "ios/chrome/test/earl_grey/chrome_util.h"
+#include "ios/chrome/test/earl_grey/chrome_util.h"
 
 #import <EarlGrey/EarlGrey.h>
 

ios/chrome/test/google_toolbox_unittest.mm

@@ -5,7 +5,7 @@
 #import <Foundation/Foundation.h>
 
 #include "base/logging.h"
-#include "testing/gtest_mac.h"
+#import "testing/gtest_mac.h"
 #import "third_party/google_toolbox_for_mac/src/Foundation/GTMNSDictionary+URLArguments.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.mm

@@ -5,7 +5,7 @@
 #include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h"
 
 #include "base/logging.h"
-#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 
 IOSChromeScopedTestingChromeBrowserProvider::
     IOSChromeScopedTestingChromeBrowserProvider(

ios/chrome/test/ios_chrome_unit_test_suite.mm

@@ -13,9 +13,9 @@
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/test/testing_application_context.h"
-#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/test_chrome_provider_initializer.h"
-#include "ios/web/public/web_client.h"
+#import "ios/web/public/web_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"

ios/chrome/test/ocmock/scoped_mock_object.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_TEST_OCMOCK_SCOPED_MOCK_OBJECT_H_
 #define IOS_CHROME_TEST_OCMOCK_SCOPED_MOCK_OBJECT_H_
 
-#include "base/mac/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 // Helper class that constructs an OCMock and manages ownership of it.

ios/chrome/test/ocmock/scoped_verifying_mock_object.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_TEST_OCMOCK_SCOPED_VERIFYING_MOCK_OBJECT_H_
 #define IOS_CHROME_TEST_OCMOCK_SCOPED_VERIFYING_MOCK_OBJECT_H_
 
-#include "ios/chrome/test/ocmock/scoped_mock_object.h"
+#import "ios/chrome/test/ocmock/scoped_mock_object.h"
 #include "third_party/ocmock/gtest_support.h"
 
 // Helper class that constructs an OCMock and automatically verifies the mock

ios/chrome/test/testing_application_context.mm

@@ -9,7 +9,7 @@
 #include "base/time/default_clock.h"
 #include "base/time/default_tick_clock.h"
 #include "components/network_time/network_time_tracker.h"
-#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
 TestingApplicationContext::TestingApplicationContext()

ios/testing/earl_grey/disabled_test_macros.h

@@ -5,6 +5,8 @@
 #ifndef IOS_TESTING_EARL_GREY_DISABLED_TEST_MACROS_H_
 #define IOS_TESTING_EARL_GREY_DISABLED_TEST_MACROS_H_
 
+#import <Foundation/Foundation.h>
+
 // A macro that forces an Earl Grey test to pass. It should be used to disable
 // tests that fail due to a bug. This macro should be used when the
 // configuration for which the test should be disabled can only be determined

ios/testing/ocmock_complex_type_helper.mm

@@ -5,7 +5,7 @@
 #import "ios/testing/ocmock_complex_type_helper.h"
 
 #include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/testing/ocmock_complex_type_helper_unittest.mm

@@ -5,7 +5,7 @@
 #import "ios/testing/ocmock_complex_type_helper.h"
 
 #include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"

ios/testing/wait_util.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "base/ios/block_types.h"
+#import "base/ios/block_types.h"
 
 namespace testing {
 

ios/testing/wait_util.mm

@@ -4,7 +4,7 @@
 
 #import "ios/testing/wait_util.h"
 
-#include "base/test/ios/wait_util.h"
+#import "base/test/ios/wait_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."