[ios] Move ScreenTime feature flag out of ios/c/b/ui

* Moves feature flag file to //ios/chrome/browser/screen_time

This was placed in the wrong place to begin with.
This ensures that //ios/c/b does not depend on //ios/c/b/ui.

Bug: 1123704
Change-Id: I103ad33fc14b56109249ee794c1e52a92f1a8a2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2393300
Commit-Queue: edchin <edchin@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807119}

ios/chrome/browser/flags/BUILD.gn

@@ -49,13 +49,13 @@ source_set("flags") {
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/open_in:features",
     "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/screen_time:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/download:features",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/page_info:features",
-    "//ios/chrome/browser/ui/screen_time:feature_flags",
     "//ios/chrome/browser/ui/settings/autofill:feature_flags",
     "//ios/chrome/browser/ui/tab_grid:features",
     "//ios/chrome/browser/ui/table_view:feature_flags",

ios/chrome/browser/flags/about_flags.mm

@@ -62,13 +62,13 @@
 #include "ios/chrome/browser/flags/ios_chrome_flag_descriptions.h"
 #import "ios/chrome/browser/open_in/features.h"
 #include "ios/chrome/browser/policy/policy_features.h"
+#include "ios/chrome/browser/screen_time/features.h"
 #include "ios/chrome/browser/system_flags.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
 #import "ios/chrome/browser/ui/download/features.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_features.h"
 #import "ios/chrome/browser/ui/infobars/infobar_feature.h"
 #import "ios/chrome/browser/ui/page_info/features.h"
-#include "ios/chrome/browser/ui/screen_time/features.h"
 #include "ios/chrome/browser/ui/settings/autofill/features.h"
 #import "ios/chrome/browser/ui/tab_grid/features.h"
 #import "ios/chrome/browser/ui/table_view/feature_flags.h"

ios/chrome/browser/screen_time/BUILD.gn

+# Copyright 2020 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("feature_flags") {
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  deps = [ "//base" ]
+}

ios/chrome/browser/screen_time/OWNERS

+edchin@chromium.org
+
+# TEAM: ios-directory-owners@chromium.org
+# OS: iOS
\ No newline at end of file

ios/chrome/browser/ui/screen_time/features.h → ios/chrome/browser/screen_time/features.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_UI_SCREEN_TIME_FEATURES_H_
-#define IOS_CHROME_BROWSER_UI_SCREEN_TIME_FEATURES_H_
+#ifndef IOS_CHROME_BROWSER_SCREEN_TIME_FEATURES_H_
+#define IOS_CHROME_BROWSER_SCREEN_TIME_FEATURES_H_
 
 #include "base/feature_list.h"
 
@@ -13,4 +13,4 @@ extern const base::Feature kScreenTimeIntegration;
 // Returns true if ScreenTime integration is enabled.
 bool IsScreenTimeIntegrationEnabled();
 
-#endif  // IOS_CHROME_BROWSER_UI_SCREEN_TIME_FEATURES_H_
+#endif  // IOS_CHROME_BROWSER_SCREEN_TIME_FEATURES_H_

ios/chrome/browser/ui/screen_time/features.mm → ios/chrome/browser/screen_time/features.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/browser/ui/screen_time/features.h"
+#import "ios/chrome/browser/screen_time/features.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/browser_container/BUILD.gn

@@ -18,10 +18,10 @@ source_set("browser_container") {
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
+    "//ios/chrome/browser/screen_time:feature_flags",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/overlays",
     "//ios/chrome/browser/ui/screen_time",
-    "//ios/chrome/browser/ui/screen_time:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public",
     "//url",

ios/chrome/browser/ui/browser_container/browser_container_coordinator.mm

@@ -9,10 +9,10 @@
 #include "base/check.h"
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/overlays/public/overlay_presenter.h"
+#import "ios/chrome/browser/screen_time/features.h"
 #import "ios/chrome/browser/ui/browser_container/browser_container_mediator.h"
 #import "ios/chrome/browser/ui/browser_container/browser_container_view_controller.h"
 #import "ios/chrome/browser/ui/overlays/overlay_container_coordinator.h"
-#import "ios/chrome/browser/ui/screen_time/features.h"
 #include "url/gurl.h"
 
 #if defined(__IPHONE_14_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0

ios/chrome/browser/ui/screen_time/BUILD.gn

@@ -23,7 +23,6 @@ source_set("screen_time") {
     ]
     configs += [ "//build/config/compiler:enable_arc" ]
     deps = [
-      ":feature_flags",
       "//base",
       "//ios/chrome/browser/browser_state",
       "//ios/chrome/browser/main:public",
@@ -35,12 +34,3 @@ source_set("screen_time") {
     ]
   }
 }
-
-source_set("feature_flags") {
-  sources = [
-    "features.h",
-    "features.mm",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  deps = [ "//base" ]
-}