[iOS] Reorganize toolbar's folder

Now that the toolbar's files have been cleaned up after UI Refresh,
the folder can be reorganized.
The files related to the fullscreen features are moved to a separate
folder. The toolbar model delegate gets its own gn target.
The resources are unused and are removed.

Bug: 800266
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I0e7043e13c2c90c6f939af55d7e447f929667681
Reviewed-on: https://chromium-review.googlesource.com/1245798Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594311}

ios/chrome/browser/tabs/BUILD.gn

@@ -118,7 +118,6 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",

ios/chrome/browser/ui/BUILD.gn

@@ -141,7 +141,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/web:web_internal",
@@ -398,13 +397,14 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/tabs:coordinator",
     "//ios/chrome/browser/ui/tabs/requirements",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui_broadcasting_util",
+    "//ios/chrome/browser/ui/toolbar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/toolbar/adaptive",
     "//ios/chrome/browser/ui/toolbar/adaptive:adaptive_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
+    "//ios/chrome/browser/ui/toolbar/fullscreen",
+    "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
@@ -439,14 +439,12 @@ source_set("ui_internal") {
   public_deps = [
     ":external_files",
     "//ios/chrome/browser/ui/side_swipe",
-    "//ios/chrome/browser/ui/toolbar",
   ]
   allow_circular_includes_from = [
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tabs:coordinator",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web:web_internal",
   ]
   libs = [
@@ -535,7 +533,7 @@ source_set("perf_tests") {
     "//ios/chrome/browser/tabs:tabs_internal",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/ui/toolbar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/toolbar/adaptive",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/browser_view_controller.mm

@@ -201,12 +201,12 @@
 #import "ios/chrome/browser/ui/toolbar/adaptive/secondary_toolbar_coordinator.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive/toolbar_coordinator_adaptor.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
-#import "ios/chrome/browser/ui/toolbar/legacy_toolbar_ui_updater.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_util.h"
 #import "ios/chrome/browser/ui/toolbar/public/features.h"
 #import "ios/chrome/browser/ui/toolbar/public/primary_toolbar_coordinator.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui_broadcasting_util.h"
 #import "ios/chrome/browser/ui/translate/language_selection_coordinator.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #include "ios/chrome/browser/ui/ui_util.h"

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

@@ -63,11 +63,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/settings/utils:utils",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/adaptive:adaptive_ui",
-    "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
@@ -125,8 +121,7 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
-    "//ios/chrome/browser/ui/toolbar/buttons:buttons",
+    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/common/favicon",
     "//ios/web/public",

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm

@@ -35,10 +35,6 @@
 #import "ios/chrome/browser/ui/ntp/notification_promo_whats_new.h"
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
 #import "ios/chrome/browser/ui/settings/utils/pref_backed_boolean.h"
-#import "ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view_controller.h"
-#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.h"
-#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.h"
-#import "ios/chrome/browser/ui/toolbar/clean/toolbar_mediator.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"

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

@@ -42,8 +42,6 @@ source_set("ntp_controller") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/public/provider/chrome/browser/voice",
     "//ui/base",
   ]
@@ -123,7 +121,6 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/favicon",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",

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

@@ -89,7 +89,6 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/omnibox",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/test/app:test_support",

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

@@ -56,7 +56,6 @@ source_set("unit_tests") {
     ":side_swipe",
     "//base",
     "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",

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

@@ -2,104 +2,27 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("toolbar") {
+source_set("toolbar_model_delegate") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "toolbar_model_delegate_ios.h",
     "toolbar_model_delegate_ios.mm",
   ]
   deps = [
-    ":toolbar_ui",
-    "resources:toolbar_dark_newtab",
-    "resources:toolbar_dark_newtab_active",
-    "resources:toolbar_dark_newtab_incognito",
-    "resources:toolbar_dark_newtab_incognito_active",
     "//base",
+    "//components/omnibox/browser",
     "//components/prefs",
     "//components/toolbar",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ssl",
-    "//ios/chrome/browser/ui:ui_util",
-    "//ios/chrome/browser/ui/activity_services/requirements",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/qr_scanner/requirements",
-    "//ios/chrome/browser/ui/toolbar/clean:toolbar",
-    "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
-    "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/web_state_list",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/web/public",
   ]
   libs = [ "UIKit.framework" ]
 }
 
-source_set("toolbar_ui") {
-  sources = [
-    "legacy_toolbar_ui_updater.h",
-    "legacy_toolbar_ui_updater.mm",
-    "toolbar_ui.h",
-    "toolbar_ui.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser/ui:ui_util",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/web",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  libs = [ "UIKit.framework" ]
-}
-
-source_set("toolbar_ui_broadcasting_util") {
-  sources = [
-    "toolbar_ui_broadcasting_util.h",
-    "toolbar_ui_broadcasting_util.mm",
-  ]
-  deps = [
-    ":toolbar_ui",
-    "//ios/chrome/browser/ui/broadcaster",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("unit_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "legacy_toolbar_ui_updater_unittest.mm",
-    "toolbar_ui_broadcasting_util_unittest.mm",
-  ]
-  deps = [
-    ":toolbar",
-    ":toolbar_ui",
-    ":toolbar_ui_broadcasting_util",
-    "//base",
-    "//components/bookmarks/browser",
-    "//components/bookmarks/test",
-    "//components/toolbar:test_support",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/broadcaster",
-    "//ios/chrome/browser/ui/toolbar/test",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/chrome/test:test_support",
-    "//ios/testing:ocmock_support",
-    "//ios/web/public/test",
-    "//ios/web/public/test/fakes",
-    "//testing/gtest",
-    "//third_party/ocmock",
-  ]
-}
-
 source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -108,7 +31,6 @@ source_set("eg_tests") {
   ]
 
   deps = [
-    ":toolbar",
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings",

ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn

@@ -35,7 +35,6 @@ source_set("adaptive") {
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu/public",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/public",

ios/chrome/browser/ui/toolbar/clean/BUILD.gn

@@ -35,7 +35,6 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox/popup",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",

ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn

+# Copyright 2016 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("fullscreen") {
+  sources = [
+    "legacy_toolbar_ui_updater.h",
+    "legacy_toolbar_ui_updater.mm",
+    "toolbar_ui.h",
+    "toolbar_ui.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("fullscreen_broadcasting_util") {
+  sources = [
+    "toolbar_ui_broadcasting_util.h",
+    "toolbar_ui_broadcasting_util.mm",
+  ]
+  deps = [
+    ":fullscreen",
+    "//ios/chrome/browser/ui/broadcaster",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "legacy_toolbar_ui_updater_unittest.mm",
+    "toolbar_ui_broadcasting_util_unittest.mm",
+  ]
+  deps = [
+    ":fullscreen",
+    ":fullscreen_broadcasting_util",
+    "//base",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/test",
+    "//components/toolbar:test_support",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/broadcaster",
+    "//ios/chrome/browser/ui/toolbar/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/test:test_support",
+    "//ios/testing:ocmock_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}

ios/chrome/browser/ui/toolbar/legacy_toolbar_ui_updater.h → ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater.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_TOOLBAR_LEGACY_TOOLBAR_UI_UPDATER_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_LEGACY_TOOLBAR_UI_UPDATER_H_
+#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_LEGACY_TOOLBAR_UI_UPDATER_H_
+#define IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_LEGACY_TOOLBAR_UI_UPDATER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -44,4 +44,4 @@ initWithToolbarUI:(nonnull ToolbarUIState*)toolbarUI
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_LEGACY_TOOLBAR_UI_UPDATER_H_
+#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_LEGACY_TOOLBAR_UI_UPDATER_H_

ios/chrome/browser/ui/toolbar/legacy_toolbar_ui_updater.mm → ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater.mm

@@ -2,12 +2,12 @@
 // 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/toolbar/legacy_toolbar_ui_updater.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater.h"
 
 #include <memory>
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 #import "ios/web/public/web_state/navigation_context.h"

ios/chrome/browser/ui/toolbar/legacy_toolbar_ui_updater_unittest.mm → ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater_unittest.mm

@@ -2,11 +2,11 @@
 // 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/toolbar/legacy_toolbar_ui_updater.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/legacy_toolbar_ui_updater.h"
 
 #include <memory>
 
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"

ios/chrome/browser/ui/toolbar/toolbar_ui.h → ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.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_TOOLBAR_TOOLBAR_UI_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_UI_H_
+#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_H_
+#define IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_H_
 
 #import <UIKit/UIKit.h>
 
@@ -35,4 +35,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_UI_H_
+#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_H_

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

ios/chrome/browser/ui/toolbar/toolbar_ui_broadcasting_util.h → ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_util.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_TOOLBAR_TOOLBAR_UI_BROADCASTING_UTIL_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_UI_BROADCASTING_UTIL_H_
+#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_BROADCASTING_UTIL_H_
+#define IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_BROADCASTING_UTIL_H_
 
 @class ChromeBroadcaster;
 @protocol ToolbarUI;
@@ -15,4 +15,4 @@ void StartBroadcastingToolbarUI(id<ToolbarUI> toolbar,
 // Stops broadcasting MainContentUI properties using |broadcaster|.
 void StopBroadcastingToolbarUI(ChromeBroadcaster* broadcaster);
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_UI_BROADCASTING_UTIL_H_
+#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_FULLSCREEN_TOOLBAR_UI_BROADCASTING_UTIL_H_

ios/chrome/browser/ui/toolbar/toolbar_ui_broadcasting_util.mm → ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_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.
 
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui_broadcasting_util.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_util.h"
 
 #import "ios/chrome/browser/ui/broadcaster/chrome_broadcaster.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/toolbar/toolbar_ui_broadcasting_util_unittest.mm → ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_util_unittest.mm

@@ -2,11 +2,11 @@
 // 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/toolbar/toolbar_ui_broadcasting_util.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui_broadcasting_util.h"
 
 #import "ios/chrome/browser/ui/broadcaster/chrome_broadcaster.h"
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
 #import "ios/chrome/browser/ui/toolbar/test/toolbar_broadcast_test_util.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

ios/chrome/browser/ui/toolbar/resources/BUILD.gn

-# Copyright 2017 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.
-
-import("//build/config/ios/asset_catalog.gni")
-
-imageset("toolbar_dark_newtab") {
-  sources = [
-    "toolbar_dark_newtab.imageset/Contents.json",
-    "toolbar_dark_newtab.imageset/toolbar_dark_newtab.png",
-    "toolbar_dark_newtab.imageset/toolbar_dark_newtab@2x.png",
-    "toolbar_dark_newtab.imageset/toolbar_dark_newtab@3x.png",
-  ]
-}
-
-imageset("toolbar_dark_newtab_incognito_active") {
-  sources = [
-    "toolbar_dark_newtab_incognito_active.imageset/Contents.json",
-    "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active.png",
-    "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active@2x.png",
-    "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active@3x.png",
-  ]
-}
-
-imageset("toolbar_dark_newtab_incognito") {
-  sources = [
-    "toolbar_dark_newtab_incognito.imageset/Contents.json",
-    "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito.png",
-    "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito@2x.png",
-    "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito@3x.png",
-  ]
-}
-
-imageset("toolbar_dark_newtab_active") {
-  sources = [
-    "toolbar_dark_newtab_active.imageset/Contents.json",
-    "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active.png",
-    "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active@2x.png",
-    "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active@3x.png",
-  ]
-}

ios/chrome/browser/ui/toolbar/resources/toolbar_dark_newtab.imageset/Contents.json

-{
-    "images": [
-        {
-            "idiom": "universal",
-            "scale": "1x",
-            "filename": "toolbar_dark_newtab.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "2x",
-            "filename": "toolbar_dark_newtab@2x.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "3x",
-            "filename": "toolbar_dark_newtab@3x.png"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}

ios/chrome/browser/ui/toolbar/resources/toolbar_dark_newtab_active.imageset/Contents.json

-{
-    "images": [
-        {
-            "idiom": "universal",
-            "scale": "1x",
-            "filename": "toolbar_dark_newtab_active.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "2x",
-            "filename": "toolbar_dark_newtab_active@2x.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "3x",
-            "filename": "toolbar_dark_newtab_active@3x.png"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}

ios/chrome/browser/ui/toolbar/resources/toolbar_dark_newtab_incognito.imageset/Contents.json

-{
-    "images": [
-        {
-            "idiom": "universal",
-            "scale": "1x",
-            "filename": "toolbar_dark_newtab_incognito.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "2x",
-            "filename": "toolbar_dark_newtab_incognito@2x.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "3x",
-            "filename": "toolbar_dark_newtab_incognito@3x.png"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}

ios/chrome/browser/ui/toolbar/resources/toolbar_dark_newtab_incognito_active.imageset/Contents.json

-{
-    "images": [
-        {
-            "idiom": "universal",
-            "scale": "1x",
-            "filename": "toolbar_dark_newtab_incognito_active.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "2x",
-            "filename": "toolbar_dark_newtab_incognito_active@2x.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "3x",
-            "filename": "toolbar_dark_newtab_incognito_active@3x.png"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}

ios/chrome/browser/ui/toolbar/test/BUILD.gn

@@ -20,8 +20,7 @@ source_set("test") {
   deps = [
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/broadcaster",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
+    "//ios/chrome/browser/ui/toolbar/fullscreen",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]

ios/chrome/browser/ui/toolbar/test/toolbar_broadcast_test_util.mm

@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/ui/toolbar/test/toolbar_broadcast_test_util.h"
 
+#import "ios/chrome/browser/ui/toolbar/fullscreen/toolbar_ui.h"
 #import "ios/chrome/browser/ui/toolbar/test/test_toolbar_ui_observer.h"
-#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

ios/chrome/test/BUILD.gn

@@ -233,9 +233,9 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/table_view:unit_tests",
     "//ios/chrome/browser/ui/table_view/cells:unit_tests",
     "//ios/chrome/browser/ui/tabs:unit_tests",
-    "//ios/chrome/browser/ui/toolbar:unit_tests",
     "//ios/chrome/browser/ui/toolbar/adaptive:unit_tests",
     "//ios/chrome/browser/ui/toolbar/clean:unit_tests",
+    "//ios/chrome/browser/ui/toolbar/fullscreen:unit_tests",
     "//ios/chrome/browser/ui/util:unit_tests",
     "//ios/chrome/browser/ui/voice:unit_tests",
     "//ios/chrome/browser/update_client:unit_tests",