Upstream WebOmniboxEditController.

ios/chrome/ios_chrome.gyp

Index: ios/chrome/ios_chrome.gyp
diff --git a/ios/chrome/ios_chrome.gyp b/ios/chrome/ios_chrome.gyp
index 67d50629ad1194909788430b01677940cd152eb3..27253c6d417c97ae6c812a51389fdbd47b20ea8d 100644
--- a/ios/chrome/ios_chrome.gyp
+++ b/ios/chrome/ios_chrome.gyp
@@ -66,7 +66,6 @@
         '../../components/components.gyp:leveldb_proto',
         '../../components/components.gyp:metrics',
         '../../components/components.gyp:omnibox_browser',
-        '../../components/components.gyp:open_from_clipboard',

[blundell, 2015/08/06 18:56:23]

why all the subtractions from this file?

[sdefresne, 2015/08/07 07:24:05]

It's a mistake, I mixed two CLs. Fixed.

         '../../components/components.gyp:password_manager_core_browser',
         '../../components/components.gyp:pref_registry',
         '../../components/components.gyp:search',
@@ -78,7 +77,6 @@
         '../../components/components.gyp:translate_core_browser',
         '../../components/components.gyp:translate_ios_browser',
         '../../components/components.gyp:undo_component',
-        '../../components/components.gyp:upload_list',
         '../../components/components.gyp:version_info',
         '../../components/components.gyp:web_resource',
         '../../components/components.gyp:webdata_services',
@@ -167,8 +165,6 @@
         'browser/crash_report/crash_report_multi_parameter.mm',
         'browser/crash_report/crash_report_user_application_state.h',
         'browser/crash_report/crash_report_user_application_state.mm',
-        'browser/crash_report/crash_upload_list.cc',
-        'browser/crash_report/crash_upload_list.h',
         'browser/dom_distiller/distiller_viewer.cc',
         'browser/dom_distiller/distiller_viewer.h',
         'browser/dom_distiller/dom_distiller_service_factory.cc',
@@ -272,8 +268,6 @@
         'browser/net/retryable_url_fetcher.mm',
         'browser/omnibox/omnibox_event_global_tracker.cc',
         'browser/omnibox/omnibox_event_global_tracker.h',
-        'browser/open_from_clipboard/create_clipboard_recent_content.h',
-        'browser/open_from_clipboard/create_clipboard_recent_content.mm',
         'browser/passwords/password_generation_utils.h',
         'browser/passwords/password_generation_utils.mm',
         'browser/pref_names.cc',
@@ -387,6 +381,8 @@
         'browser/ui/keyboard/hardware_keyboard_watcher.mm',
         'browser/ui/native_content_controller.h',
         'browser/ui/native_content_controller.mm',
+        'browser/ui/omnibox/web_omnibox_edit_controller.cc',
+        'browser/ui/omnibox/web_omnibox_edit_controller.h',
         'browser/ui/orientation_limiting_navigation_controller.h',
         'browser/ui/orientation_limiting_navigation_controller.mm',
         'browser/ui/reversed_animation.h',