Move omnibox files from ios/shared.

Moves files from ios/shared/chrome/browser/ui/omnibox to
ios/c/b/ui/omnibox. Renames ios/c/b/ui/omnibox:omnibox to
ios/c/b/ui/omnibox:omnibox_utils.

Bug: 
Change-Id: Ice67095eddfbe00f11af71bebe5f0d3c0255fe97
Reviewed-on: https://chromium-review.googlesource.com/654840Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501669}

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

-# Copyright 2016 The Chromium Authors. All rights reserved.
+# 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.
 
 source_set("omnibox") {
+  sources = [
+    "location_bar_controller.cc",
+    "location_bar_controller.h",
+    "location_bar_delegate.h",
+    "web_omnibox_edit_controller.cc",
+    "web_omnibox_edit_controller.h",
+  ]
+  deps = [
+    "//base",
+    "//components/omnibox/browser",
+    "//ui/base",
+  ]
+}
+
+source_set("omnibox_util") {
   sources = [
     "omnibox_util.cc",
     "omnibox_util.h",
@@ -51,6 +66,7 @@ source_set("omnibox_internal") {
   ]
   deps = [
     ":omnibox",
+    ":omnibox_util",
     "resources:omnibox_background",
     "resources:omnibox_transparent_background",
     "//base",
@@ -78,7 +94,6 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",

ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm

@@ -22,8 +22,8 @@
 #include "ios/chrome/browser/prerender/prerender_service_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #include "ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h"
+#include "ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
-#include "ios/shared/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "url/gurl.h"

ios/shared/chrome/browser/ui/omnibox/location_bar_controller.cc → ios/chrome/browser/ui/omnibox/location_bar_controller.cc

@@ -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/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_controller.h"
 
 LocationBarController::LocationBarController() {}
 

ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h → ios/chrome/browser/ui/omnibox/location_bar_controller.h

@@ -5,7 +5,7 @@
 #ifndef IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_CONTROLLER_H_
 #define IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_CONTROLLER_H_
 
-#include "ios/shared/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
+#include "ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 
 class OmniboxView;
 

ios/chrome/browser/ui/omnibox/location_bar_controller_impl.h

@@ -11,7 +11,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/omnibox/browser/omnibox_view.h"
-#include "ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_controller.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 

ios/chrome/browser/ui/omnibox/location_bar_controller_impl.mm

@@ -20,13 +20,13 @@
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
-#include "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/navigation_manager.h"

ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm

@@ -28,9 +28,9 @@
 #include "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_text_field_paste_delegate.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
+#include "ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
-#include "ios/shared/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 #include "ios/web/public/referrer.h"
 #import "net/base/mac/url_conversions.h"
 #include "skia/ext/skia_utils_ios.h"

ios/shared/chrome/browser/ui/omnibox/web_omnibox_edit_controller.cc → ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller.cc

@@ -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/shared/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
+#include "ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h"
 
 WebOmniboxEditController::WebOmniboxEditController() {}
 

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

@@ -73,11 +73,11 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/base",
     "//ios/chrome/test/earl_grey:test_support",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey",
     "//ios/web/public/test/http_server",

ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/app/main_controller.h"
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 #include "ios/chrome/browser/ui/icons/chrome_icon.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #include "ios/chrome/browser/ui/qr_scanner/camera_controller.h"
 #include "ios/chrome/browser/ui/qr_scanner/qr_scanner_view.h"
 #include "ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller.h"
@@ -26,7 +27,6 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
-#include "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #include "ios/web/public/test/http_server/http_server_util.h"
 #import "third_party/ocmock/OCMock/OCMock.h"

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

@@ -67,6 +67,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/popup_menu",
     "//ios/chrome/browser/ui/qr_scanner/requirements",
     "//ios/chrome/browser/ui/toolbar/keyboard_assist",
@@ -79,7 +80,6 @@ source_set("toolbar") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/voice",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",

ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

@@ -44,7 +44,9 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #include "ios/chrome/browser/ui/commands/start_voice_search_command.h"
 #import "ios/chrome/browser/ui/image_util.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_controller.h"
 #include "ios/chrome/browser/ui/omnibox/location_bar_controller_impl.h"
+#include "ios/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_view.h"
 #import "ios/chrome/browser/ui/reversed_animation.h"
@@ -65,8 +67,6 @@
 #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/images/branded_image_provider.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
-#include "ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
-#include "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"

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

@@ -16,11 +16,11 @@ source_set("omnibox") {
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/web",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]

ios/clean/chrome/browser/ui/omnibox/location_bar_mediator.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #include <memory>
 
-#import "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
+#import "ios/chrome/browser/ui/omnibox/location_bar_delegate.h"
 
 class LocationBarController;
 class WebStateList;

ios/clean/chrome/browser/ui/omnibox/location_bar_mediator.mm

@@ -7,11 +7,11 @@
 #include "base/memory/ptr_util.h"
 #include "base/scoped_observer.h"
 #include "base/strings/utf_string_conversions.h"
+#import "ios/chrome/browser/ui/omnibox/location_bar_controller.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.h"
 #include "ios/chrome/browser/web_state_list/web_state_list.h"
 #include "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
-#import "ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"