Fix layering violation in //components/translate/ios/browser

As documented in //components/README.md, code in components must not
depend on higher-level layers of the Chromium codebase, including
//ios/chrome.

Move ukm_url_recorder.* and tests from ios/chrome/browser/metrics to
components/ukm/ios (to parallel the version in content that is found
in components/ukm/content).

Fix UkmUrlRecorderTest to use WebTestWithWebState instead of the
unavailable (due to layering violation) ChromeWebTest.

Bug: 754895
Change-Id: I829486037063f16fe5fca5b7617017c0530a1859
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1878649
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710273}

components/BUILD.gn

@@ -209,6 +209,7 @@ test("components_unittests") {
       "//components/security_state/ios:unit_tests",
       "//components/signin/ios/browser:unit_tests",
       "//components/translate/ios/browser:unit_tests",
+      "//components/ukm/ios:unit_tests",
     ]
   } else {  # !iOS
     deps += [

components/translate/ios/browser/BUILD.gn

@@ -29,7 +29,7 @@ source_set("browser") {
     "//components/translate/core/browser",
     "//components/translate/core/common",
     "//components/translate/core/language_detection",
-    "//ios/chrome/browser/metrics:ukm_url_recorder",
+    "//components/ukm/ios:ukm_url_recorder",
     "//ios/web/common",
     "//ios/web/public",
     "//ios/web/public/deprecated",

components/translate/ios/browser/DEPS

 include_rules = [
   "+components/language/core/browser",
-  "+ios/chrome/browser/metrics"
+  "+components/ukm/ios",
 ]

components/translate/ios/browser/ios_translate_driver.mm

@@ -18,7 +18,7 @@
 #import "components/translate/ios/browser/js_translate_manager.h"
 #import "components/translate/ios/browser/language_detection_controller.h"
 #import "components/translate/ios/browser/translate_controller.h"
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #include "ios/web/public/navigation/navigation_context.h"

components/ukm/ios/BUILD.gn

@@ -4,6 +4,13 @@
 
 assert(target_os == "ios")
 
+group("ios") {
+  public_deps = [
+    ":features",
+    ":ukm_url_recorder",
+  ]
+}
+
 source_set("features") {
   sources = [
     "features.cc",
@@ -13,3 +20,38 @@ source_set("features") {
     "//base",
   ]
 }
+
+source_set("ukm_url_recorder") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "ukm_url_recorder.h",
+    "ukm_url_recorder.mm",
+  ]
+  public_deps = [
+    "//services/metrics/public/cpp:metrics_cpp",
+  ]
+  deps = [
+    "//base",
+    "//ios/web",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "ukm_url_recorder_unittest.mm",
+  ]
+  deps = [
+    ":ukm_url_recorder",
+    "//base",
+    "//base/test:test_support",
+    "//components/ukm:test_support",
+    "//ios/web/public",
+    "//ios/web/public/test",
+    "//net:test_support",
+    "//services/metrics/public/cpp:metrics_cpp",
+    "//testing/gtest",
+  ]
+}

components/ukm/ios/DEPS

+include_rules = [
+  "+ios/web/public",
+  "+net/test",
+]

ios/chrome/browser/metrics/ukm_url_recorder.h → components/ukm/ios/ukm_url_recorder.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_CHROME_BROWSER_METRICS_IOS_UKM_URL_RECORDER_H_
-#define IOS_CHROME_BROWSER_METRICS_IOS_UKM_URL_RECORDER_H_
+#ifndef COMPONENTS_UKM_IOS_UKM_URL_RECORDER_H_
+#define COMPONENTS_UKM_IOS_UKM_URL_RECORDER_H_
 
 #include "services/metrics/public/cpp/ukm_source_id.h"
 
@@ -22,4 +22,4 @@ SourceId GetSourceIdForWebStateDocument(web::WebState* web_state);
 
 }  // namespace ukm
 
-#endif  // IOS_CHROME_BROWSER_METRICS_IOS_UKM_URL_RECORDER_H_
+#endif  // COMPONENTS_UKM_IOS_UKM_URL_RECORDER_H_

ios/chrome/browser/metrics/ukm_url_recorder.mm → components/ukm/ios/ukm_url_recorder.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/browser/metrics/ukm_url_recorder.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 
 #include <utility>
 

ios/chrome/browser/metrics/ukm_url_recorder_unittest.mm → components/ukm/ios/ukm_url_recorder_unittest.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.
 
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 
 #include "base/bind.h"
 #include "base/optional.h"
 #import "base/test/ios/wait_util.h"
 #include "components/ukm/test_ukm_recorder.h"
-#import "ios/chrome/browser/web/chrome_web_test.h"
 #import "ios/web/public/navigation/navigation_manager.h"
+#import "ios/web/public/test/web_test_with_web_state.h"
 #import "ios/web/public/web_state.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ -55,14 +55,14 @@ std::unique_ptr<net::test_server::HttpResponse> HandleRequest(
 
 }  // namespace
 
-class UkmUrlRecorderTest : public ChromeWebTest {
+class UkmUrlRecorderTest : public web::WebTestWithWebState {
  protected:
   UkmUrlRecorderTest() {
     server_.RegisterDefaultHandler(base::BindRepeating(&HandleRequest));
   }
 
   void SetUp() override {
-    ChromeWebTest::SetUp();
+    web::WebTestWithWebState::SetUp();
     ASSERT_TRUE(server_.Start());
     ukm::InitializeSourceUrlRecorderForWebState(web_state());
   }

ios/chrome/browser/find_in_page/BUILD.gn

@@ -21,7 +21,7 @@ source_set("find_in_page") {
     ":feature_flags",
     ":injected_js",
     "//base",
-    "//ios/chrome/browser/metrics:ukm_url_recorder",
+    "//components/ukm/ios:ukm_url_recorder",
     "//ios/chrome/browser/web",
     "//ios/web/public",
     "//ios/web/public/deprecated",
@@ -64,9 +64,9 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/ukm:test_support",
+    "//components/ukm/ios:ukm_url_recorder",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/find_in_page:feature_flags",
-    "//ios/chrome/browser/metrics:ukm_url_recorder",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/browser/web:web_internal",
     "//ios/web/public/deprecated",

ios/chrome/browser/find_in_page/find_in_page_controller.mm

@@ -11,11 +11,11 @@
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 #import "ios/chrome/browser/find_in_page/features.h"
 #import "ios/chrome/browser/find_in_page/find_in_page_model.h"
 #import "ios/chrome/browser/find_in_page/find_in_page_response_delegate.h"
 #import "ios/chrome/browser/find_in_page/js_findinpage_manager.h"
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/web/dom_altering_lock.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #import "ios/web/public/find_in_page/find_in_page_manager.h"

ios/chrome/browser/find_in_page/find_in_page_controller_unittest.mm

@@ -6,11 +6,11 @@
 
 #import "base/mac/foundation_util.h"
 #import "base/test/ios/wait_util.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #import "ios/chrome/browser/find_in_page/find_in_page_model.h"
 #import "ios/chrome/browser/find_in_page/find_in_page_response_delegate.h"
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/web/chrome_web_client.h"
 #import "ios/chrome/browser/web/chrome_web_test.h"
 #include "testing/gtest/include/gtest/gtest.h"

ios/chrome/browser/metrics/BUILD.gn

@@ -2,32 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("ukm_url_recorder") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "ukm_url_recorder.h",
-    "ukm_url_recorder.mm",
-  ]
-  public_deps = [
-    "//services/metrics/public/cpp:metrics_cpp",
-  ]
-  deps = [
-    "//base",
-    "//ios/web",
-    "//url",
-  ]
-}
-
-source_set("features") {
-  sources = [
-    "features.cc",
-    "features.h",
-  ]
-  deps = [
-    "//base",
-  ]
-}
-
 source_set("chrome_browser_state_client") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -68,11 +42,10 @@ source_set("metrics") {
     "previous_session_info_private.h",
   ]
   public_deps = [
-    ":ukm_url_recorder",
+    "//components/ukm/ios:ukm_url_recorder",
   ]
   deps = [
     ":chrome_browser_state_client",
-    ":features",
     "//base",
     "//components/browser_sync",
     "//components/crash/core/common",
@@ -125,11 +98,9 @@ source_set("unit_tests") {
     "ios_chrome_stability_metrics_provider_unittest.mm",
     "mobile_session_shutdown_metrics_provider_unittest.mm",
     "previous_session_info_unittest.mm",
-    "ukm_url_recorder_unittest.mm",
   ]
   deps = [
     ":chrome_browser_state_client",
-    ":features",
     ":metrics",
     "//base",
     "//base/test:test_support",
@@ -139,14 +110,14 @@ source_set("unit_tests") {
     "//components/network_time:network_time",
     "//components/prefs",
     "//components/prefs:test_support",
-    "//components/ukm:test_support",
+    "//components/ukm",
     "//components/version_info",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/test:test_support",
     "//ios/web/common",
-    "//ios/web/public:public",
+    "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net:test_support",

ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.mm

@@ -7,7 +7,6 @@
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/metrics/features.h"
 #include "ios/web/common/features.h"
 #import "ios/web/public/navigation/navigation_context.h"
 #include "url/gurl.h"

ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider_unittest.mm

@@ -9,7 +9,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/prefs/testing_pref_service.h"
-#include "ios/chrome/browser/metrics/features.h"
 #include "ios/web/common/features.h"
 #import "ios/web/public/test/fakes/fake_navigation_context.h"
 #include "testing/gtest/include/gtest/gtest.h"

ios/chrome/browser/metrics/tab_usage_recorder.mm

@@ -7,9 +7,9 @@
 #import <UIKit/UIKit.h>
 
 #include "base/metrics/histogram_macros.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #import "ios/chrome/browser/metrics/previous_session_info.h"
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/prerender/prerender_service.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/web/public/navigation/navigation_context.h"

ios/chrome/browser/passwords/BUILD.gn

@@ -62,13 +62,13 @@ source_set("passwords") {
     "//components/sync",
     "//components/translate/core/browser:browser",
     "//components/ukm",
+    "//components/ukm/ios:ukm_url_recorder",
     "//google_apis",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
-    "//ios/chrome/browser/metrics:ukm_url_recorder",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/sync/glue",

ios/chrome/browser/passwords/password_controller.mm

@@ -40,11 +40,11 @@
 #import "components/password_manager/ios/password_suggestion_helper.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/sync/driver/sync_service.h"
+#import "components/ukm/ios/ukm_url_recorder.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/infobars/infobar.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/infobars/infobar_type.h"
-#import "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #include "ios/chrome/browser/passwords/credential_manager.h"
 #import "ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h"
 #import "ios/chrome/browser/passwords/ios_chrome_update_password_infobar_delegate.h"

ios/chrome/browser/payments/payment_request.mm

@@ -28,11 +28,11 @@
 #include "components/payments/core/web_payment_request.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
+#import "components/ukm/ios/ukm_url_recorder.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/autofill/address_normalizer_factory.h"
 #include "ios/chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#import "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/payments/ios_payment_instrument.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
 #include "ios/chrome/browser/signin/identity_manager_factory.h"

ios/chrome/browser/tabs/tab_helper_util.mm

@@ -15,6 +15,7 @@
 #include "components/keyed_service/core/service_access_type.h"
 #import "components/language/ios/browser/ios_language_detection_tab_helper.h"
 #import "components/security_state/ios/insecure_input_tab_helper.h"
+#import "components/ukm/ios/ukm_url_recorder.h"
 #import "ios/chrome/browser/autofill/autofill_tab_helper.h"
 #import "ios/chrome/browser/autofill/form_suggestion_tab_helper.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ -28,7 +29,6 @@
 #include "ios/chrome/browser/infobars/infobar_badge_tab_helper.h"
 #import "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/itunes_urls/itunes_urls_handler_tab_helper.h"
-#import "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/network_activity/network_activity_indicator_tab_helper.h"
 #import "ios/chrome/browser/open_in/open_in_tab_helper.h"
 #import "ios/chrome/browser/overscroll_actions/overscroll_actions_tab_helper.h"

ios/chrome/browser/ui/autofill/chrome_autofill_client_ios.mm

@@ -25,6 +25,7 @@
 #include "components/security_state/ios/security_state_utils.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/translate/core/browser/translate_manager.h"
+#include "components/ukm/ios/ukm_url_recorder.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/autofill/address_normalizer_factory.h"
 #include "ios/chrome/browser/autofill/autocomplete_history_manager_factory.h"
@@ -33,7 +34,6 @@
 #include "ios/chrome/browser/autofill/strike_database_factory.h"
 #include "ios/chrome/browser/infobars/infobar.h"
 #include "ios/chrome/browser/infobars/infobar_utils.h"
-#include "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #include "ios/chrome/browser/signin/identity_manager_factory.h"
 #include "ios/chrome/browser/sync/profile_sync_service_factory.h"
 #include "ios/chrome/browser/translate/chrome_ios_translate_client.h"