[ios] Move FindInPage files out of web_state/

Move the find_in_page/ directory into //ios/web/ and //ios/web/public/

Bug: 896867
Change-Id: Ifd73838af8a5f83f399a12fb277d2b7690977bf5
Reviewed-on: https://chromium-review.googlesource.com/c/1446865Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Cr-Commit-Position: refs/heads/master@{#627971}

ios/web/BUILD.gn

@@ -434,6 +434,7 @@ source_set("ios_web_web_state_js_unittests") {
     "//components/url_formatter",
     "//ios/net",
     "//ios/testing:ocmock_support",
+    "//ios/web/find_in_page",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
@@ -441,7 +442,6 @@ source_set("ios_web_web_state_js_unittests") {
     "//ios/web/test:test_constants",
     "//ios/web/test:test_support",
     "//ios/web/web_state:context_menu",
-    "//ios/web/web_state:find_in_page",
     "//ios/web/web_state:navigation_context",
     "//ios/web/web_state/js",
     "//ios/web/web_state/js:script_util",

ios/web/find_in_page/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("find_in_page") {
+  deps = [
+    "//base",
+    "//ios/web/public/",
+    "//ios/web/web_state:web_frame",
+    "//ios/web/web_state:web_state_impl_header",
+  ]
+
+  sources = [
+    "find_in_page_constants.h",
+    "find_in_page_constants.mm",
+    "find_in_page_manager_impl.h",
+    "find_in_page_manager_impl.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}

ios/web/web_state/find_in_page/find_in_page_constants.h → ios/web/find_in_page/find_in_page_constants.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_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_
-#define IOS_WEB_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_
+#ifndef IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_
+#define IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_
 
 namespace web {
 
@@ -14,4 +14,4 @@ extern const char kFindInPagePump[];
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_
+#endif  // IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_CONSTANTS_H_

ios/web/web_state/find_in_page/find_in_page_constants.mm → ios/web/find_in_page/find_in_page_constants.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/web/web_state/find_in_page/find_in_page_constants.h"
+#import "ios/web/find_in_page/find_in_page_constants.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/web/web_state/find_in_page/find_in_page_manager_impl.h → ios/web/find_in_page/find_in_page_manager_impl.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_
-#define IOS_WEB_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_
+#ifndef IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_
+#define IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#import "ios/web/public/web_state/find_in_page/find_in_page_manager.h"
+#import "ios/web/public/find_in_page/find_in_page_manager.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 
 namespace web {
@@ -70,4 +70,4 @@ class FindInPageManagerImpl : public FindInPageManager,
 };
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_
+#endif  // IOS_WEB_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_IMPL_H_

ios/web/web_state/find_in_page/find_in_page_manager_impl.mm → ios/web/find_in_page/find_in_page_manager_impl.mm

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/web/web_state/find_in_page/find_in_page_manager_impl.h"
+#import "ios/web/find_in_page/find_in_page_manager_impl.h"
 
 #import "base/strings/sys_string_conversions.h"
 #include "base/values.h"
+#import "ios/web/find_in_page/find_in_page_constants.h"
 #import "ios/web/public/web_state/web_frame.h"
 #include "ios/web/public/web_state/web_frame_util.h"
 #import "ios/web/public/web_state/web_frames_manager.h"
-#import "ios/web/web_state/find_in_page/find_in_page_constants.h"
 #import "ios/web/web_state/web_state_impl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/web/public/BUILD.gn

@@ -62,7 +62,6 @@ source_set("public") {
     "web_client.h",
     "web_kit_constants.h",
     "web_state/context_menu_params.h",
-    "web_state/find_in_page/find_in_page_manager.h",
     "web_state/global_web_state_observer.h",
     "web_state/js/crw_js_injection_evaluator.h",
     "web_state/js/crw_js_injection_manager.h",

ios/web/public/find_in_page/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("find_in_page") {
+  deps = [
+    "//base",
+    "//ios/web/public/",
+  ]
+
+  sources = [
+    "find_in_page_manager.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}

ios/web/public/web_state/find_in_page/find_in_page_manager.h → ios/web/public/find_in_page/find_in_page_manager.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_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_
-#define IOS_WEB_PUBLIC_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_
+#ifndef IOS_WEB_PUBLIC_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_
+#define IOS_WEB_PUBLIC_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_
 
 #include "base/macros.h"
 #import "ios/web/public/web_state/web_state_user_data.h"
@@ -51,4 +51,4 @@ class FindInPageManager : public web::WebStateUserData<FindInPageManager> {
 
 }  // namespace web
 
-#endif  // IOS_WEB_PUBLIC_WEB_STATE_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_
+#endif  // IOS_WEB_PUBLIC_FIND_IN_PAGE_FIND_IN_PAGE_MANAGER_H_

ios/web/web_state/BUILD.gn

@@ -165,24 +165,6 @@ source_set("context_menu") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("find_in_page") {
-  deps = [
-    ":web_frame",
-    ":web_state_impl_header",
-    "//base",
-    "//ios/web/public",
-  ]
-
-  sources = [
-    "find_in_page/find_in_page_constants.h",
-    "find_in_page/find_in_page_constants.mm",
-    "find_in_page/find_in_page_manager_impl.h",
-    "find_in_page/find_in_page_manager_impl.mm",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("web_frame") {
   deps = [
     ":web_state_impl_header",

ios/web/web_state/js/find_in_page_unittest.mm

@@ -5,11 +5,11 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #import "base/test/ios/wait_util.h"
+#import "ios/web/find_in_page/find_in_page_constants.h"
 #import "ios/web/public/test/web_test_with_web_state.h"
 #import "ios/web/public/web_state/web_frame.h"
 #import "ios/web/public/web_state/web_frame_util.h"
 #import "ios/web/public/web_state/web_frames_manager.h"
-#import "ios/web/web_state/find_in_page/find_in_page_constants.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."