[iOS] Move toolbar model to location bar

The toolbar model is only used by the location bar. It is called toolbar
model to because of the components code. It has nothing to do with the
ios/chrome/browser/ui/toolbar.

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

ios/chrome/browser/ui/BUILD.gn

@@ -369,6 +369,7 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/location_bar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/main:tab_switcher",
     "//ios/chrome/browser/ui/main_content:main_content_ui",
     "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util",
@@ -398,7 +399,6 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/tabs:coordinator",
     "//ios/chrome/browser/ui/tabs/requirements",
     "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/fullscreen",
@@ -530,9 +530,9 @@ source_set("perf_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/tabs:tabs_internal",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/location_bar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_model_delegate",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",

ios/chrome/browser/ui/browser_view_controller.mm

@@ -160,6 +160,7 @@
 #import "ios/chrome/browser/ui/image_util/image_copier.h"
 #import "ios/chrome/browser/ui/image_util/image_saver.h"
 #import "ios/chrome/browser/ui/key_commands_provider.h"
+#include "ios/chrome/browser/ui/location_bar/toolbar_model_delegate_ios.h"
 #import "ios/chrome/browser/ui/location_bar_notification_names.h"
 #import "ios/chrome/browser/ui/main_content/main_content_ui.h"
 #import "ios/chrome/browser/ui/main_content/main_content_ui_broadcasting_util.h"
@@ -204,7 +205,6 @@
 #import "ios/chrome/browser/ui/toolbar/public/primary_toolbar_coordinator.h"
 #import "ios/chrome/browser/ui/toolbar/secondary_toolbar_coordinator.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_coordinator_adaptor.h"
-#include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.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/location_bar/BUILD.gn

@@ -91,6 +91,27 @@ source_set("location_bar") {
       [ "//ios/chrome/browser/ui/omnibox:omnibox_internal" ]
 }
 
+source_set("toolbar_model_delegate") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "toolbar_model_delegate_ios.h",
+    "toolbar_model_delegate_ios.mm",
+  ]
+  deps = [
+    "//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/web_state_list",
+    "//ios/web/public",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
 source_set("constants") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [

ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h → ios/chrome/browser/ui/location_bar/toolbar_model_delegate_ios.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_MODEL_DELEGATE_IOS_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_DELEGATE_IOS_H_
+#ifndef IOS_CHROME_BROWSER_UI_LOCATION_BAR_TOOLBAR_MODEL_DELEGATE_IOS_H_
+#define IOS_CHROME_BROWSER_UI_LOCATION_BAR_TOOLBAR_MODEL_DELEGATE_IOS_H_
 
 #include "base/macros.h"
 #include "components/toolbar/toolbar_model_delegate.h"
@@ -13,10 +13,10 @@ class WebStateList;
 namespace web {
 class NavigationItem;
 class WebState;
-}
+}  // namespace web
 
 // Implementation of ToolbarModelDelegate which uses an instance of
-// TabModel in order to fulfil its duties.
+// TabModel in order to fulfill its duties.
 class ToolbarModelDelegateIOS : public ToolbarModelDelegate {
  public:
   // |web_state_list| must outlive this ToolbarModelDelegateIOS object.
@@ -49,4 +49,4 @@ class ToolbarModelDelegateIOS : public ToolbarModelDelegate {
   DISALLOW_COPY_AND_ASSIGN(ToolbarModelDelegateIOS);
 };
 
-#endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_DELEGATE_IOS_H_
+#endif  // IOS_CHROME_BROWSER_UI_LOCATION_BAR_TOOLBAR_MODEL_DELEGATE_IOS_H_

ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.mm → ios/chrome/browser/ui/location_bar/toolbar_model_delegate_ios.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_model_delegate_ios.h"
+#import "ios/chrome/browser/ui/location_bar/toolbar_model_delegate_ios.h"
 
 #include "base/logging.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"

ios/chrome/browser/ui/omnibox_perftest.mm

@@ -14,10 +14,10 @@
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
+#include "ios/chrome/browser/ui/location_bar/toolbar_model_delegate_ios.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
 #import "ios/chrome/browser/ui/toolbar/primary_toolbar_coordinator.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_coordinator_delegate.h"
-#include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
 #import "ios/chrome/browser/ui/util/named_guide.h"
 #import "ios/chrome/browser/ui/util/named_guide_util.h"
 #include "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"

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

@@ -105,27 +105,6 @@ source_set("toolbar_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("toolbar_model_delegate") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "toolbar_model_delegate_ios.h",
-    "toolbar_model_delegate_ios.mm",
-  ]
-  deps = [
-    "//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/web_state_list",
-    "//ios/web/public",
-  ]
-  libs = [ "UIKit.framework" ]
-}
-
 source_set("unit_tests") {
   testonly = true