Moved crw_native_content/crw_native_content_provider to ui subdirectory.

BUG=389405

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

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

6 files changed, 17 insertions, 18 deletions

diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp
index da17880..7bc0242 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -68,11 +68,11 @@
         'alloc_with_zone_interceptor.h',
         'alloc_with_zone_interceptor.mm',
         'browser_state.mm',
+        'browser_url_rewriter_impl.cc',
+        'browser_url_rewriter_impl.h',
         'browsing_data_managers/crw_browsing_data_manager.h',
         'browsing_data_managers/crw_cookie_browsing_data_manager.h',
         'browsing_data_managers/crw_cookie_browsing_data_manager.mm',
-        'browser_url_rewriter_impl.cc',
-        'browser_url_rewriter_impl.h',
         'browsing_data_partition_impl.h',
         'browsing_data_partition_impl.mm',
         'crw_browsing_data_store.mm',
@@ -142,12 +142,11 @@
         'public/browser_state.h',
         'public/browser_url_rewriter.h',
         'public/browsing_data_partition.h',
-        'public/crw_browsing_data_store.h',
-        'public/crw_browsing_data_store_delegate.h',
         'public/cert_policy.h',
         'public/cert_store.h',
         'public/certificate_policy_cache.h',
         'public/crw_browsing_data_store.h',
+        'public/crw_browsing_data_store_delegate.h',
         'public/favicon_status.cc',
         'public/favicon_status.h',
         'public/favicon_url.cc',
@@ -175,8 +174,6 @@
         'public/web_controller_factory.h',
         'public/web_controller_factory.mm',
         'public/web_state/credential.h',
-        'public/web_state/crw_native_content.h',
-        'public/web_state/crw_native_content_provider.h',
         'public/web_state/crw_web_controller_observer.h',
         'public/web_state/crw_web_delegate.h',
         'public/web_state/crw_web_user_interface_delegate.h',
@@ -187,6 +184,8 @@
         'public/web_state/js/crw_js_injection_receiver.h',
         'public/web_state/page_scroll_state.h',
         'public/web_state/page_scroll_state.mm',
+        'public/web_state/ui/crw_native_content.h',
+        'public/web_state/ui/crw_native_content_provider.h',
         'public/web_state/url_verification_constants.h',
         'public/web_state/web_state.h',
         'public/web_state/web_state_observer.h',
@@ -314,8 +313,8 @@
         '../..',
       ],
       'sources': [
-        'web_thread_impl.h',
         'web_thread_impl.cc',
+        'web_thread_impl.h',
       ],
     },
     # Target that builds the files that shim WebThread functions to their
@@ -333,8 +332,8 @@
         '../..',
       ],
       'sources': [
-        'web_thread_adapter.h',
         'web_thread_adapter.cc',
+        'web_thread_adapter.h',
       ],
     },
     # Target shared by ios_web and CrNet.
diff --git a/ios/web/public/web_state/crw_web_delegate.h b/ios/web/public/web_state/crw_web_delegate.h
index 6915bac..6bf0458 100644
--- a/ios/web/public/web_state/crw_web_delegate.h
+++ b/ios/web/public/web_state/crw_web_delegate.h
@@ -11,7 +11,7 @@
 #include "base/ios/block_types.h"
 #include "ios/web/public/favicon_url.h"
 #include "ios/web/public/ssl_status.h"
-#import "ios/web/public/web_state/crw_native_content.h"
+#import "ios/web/public/web_state/ui/crw_native_content.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "ui/base/page_transition_types.h"
 
diff --git a/ios/web/public/web_state/crw_native_content.h b/ios/web/public/web_state/ui/crw_native_content.h
index 61463d3..0273c7b 100644
--- a/ios/web/public/web_state/crw_native_content.h
+++ b/ios/web/public/web_state/ui/crw_native_content.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_H_
-#define IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_H_
+#ifndef IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_H_
+#define IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_H_
 
 #import <UIKit/UIKit.h>
 
@@ -89,4 +89,4 @@
 
 @end
 
-#endif  // IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_H_
+#endif  // IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_H_
diff --git a/ios/web/public/web_state/crw_native_content_provider.h b/ios/web/public/web_state/ui/crw_native_content_provider.h
index 7d4a4cc..6d9eacd 100644
--- a/ios/web/public/web_state/crw_native_content_provider.h
+++ b/ios/web/public/web_state/ui/crw_native_content_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_PROVIDER_H_
-#define IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_PROVIDER_H_
+#ifndef IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_PROVIDER_H_
+#define IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_PROVIDER_H_
 #import <UIKit/UIKit.h>
 
 class GURL;
@@ -31,4 +31,4 @@ class GURL;
 
 @end
 
-#endif  // IOS_WEB_PUBLIC_WEB_STATE_CRW_NATIVE_CONTENT_PROVIDER_H_
+#endif  // IOS_WEB_PUBLIC_WEB_STATE_UI_CRW_NATIVE_CONTENT_PROVIDER_H_
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index da8309f..3c51dc1 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -49,12 +49,12 @@
 #include "ios/web/public/user_metrics.h"
 #include "ios/web/public/web_client.h"
 #include "ios/web/public/web_state/credential.h"
-#import "ios/web/public/web_state/crw_native_content.h"
-#import "ios/web/public/web_state/crw_native_content_provider.h"
 #import "ios/web/public/web_state/crw_web_controller_observer.h"
 #import "ios/web/public/web_state/crw_web_view_scroll_view_proxy.h"
 #import "ios/web/public/web_state/js/crw_js_injection_manager.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
+#import "ios/web/public/web_state/ui/crw_native_content.h"
+#import "ios/web/public/web_state/ui/crw_native_content_provider.h"
 #include "ios/web/public/web_state/url_verification_constants.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "ios/web/web_state/blocked_popup_info.h"
diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
index d772698..6f52538 100644
--- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
+++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
@@ -17,8 +17,8 @@
 #import "ios/web/navigation/crw_session_controller.h"
 #include "ios/web/navigation/web_load_params.h"
 #include "ios/web/public/web_client.h"
-#import "ios/web/public/web_state/crw_native_content_provider.h"
 #import "ios/web/public/web_state/js/crw_js_injection_manager.h"
+#import "ios/web/public/web_state/ui/crw_native_content_provider.h"
 #import "ios/web/ui_web_view_util.h"
 #include "ios/web/web_state/blocked_popup_info.h"
 #include "ios/web/web_state/frame_info.h"