Re-sync ios/web with downstream version

ios/web/ios_web.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'chromium_code': 1,
    },
   'targets': [
     {
@@ skipping 90 matching lines @@
         'public/web_state/js/crw_js_injection_evaluator.h',
         'public/web_state/js/crw_js_injection_manager.h',
         'public/web_state/js/crw_js_injection_receiver.h',
         'public/web_state/page_scroll_state.h',
         'public/web_state/page_scroll_state.mm',
         'public/web_state/url_verification_constants.h',
         'public/web_state/web_state_observer.h',
         'public/web_state/web_state_observer_bridge.h',
         'public/web_thread.h',
         'public/web_view_type.h',
+        'public/web_view_util.h',
         'string_util.cc',
         'ui_web_view_util.h',
         'ui_web_view_util.mm',
         'url_scheme_util.mm',
         'url_util.cc',
         'user_metrics.cc',
         'weak_nsobject_counter.h',
         'weak_nsobject_counter.mm',
         'web_state/blocked_popup_info.h',
         'web_state/blocked_popup_info.mm',
@@ skipping 22 matching lines @@
         'web_state/ui/crw_ui_simple_web_view_controller.mm',
         'web_state/ui/crw_wk_simple_web_view_controller.h',
         'web_state/ui/crw_wk_simple_web_view_controller.mm',
         'web_state/ui/crw_wk_web_view_crash_detector.h',
         'web_state/ui/crw_wk_web_view_crash_detector.mm',
         'web_state/ui/web_view_js_utils.h',
         'web_state/ui/web_view_js_utils.mm',
         'web_thread.cc',
         'web_thread_impl.cc',
         'web_thread_impl.h',
-        'web_view_util.h',
         'web_view_util.mm',
       ],
       'link_settings': {
         'xcode_settings': {
           'OTHER_LDFLAGS': [
             '-weak_framework WebKit',
           ]
         },
       },
     },
@@ skipping 146 matching lines @@
       'dependencies': [
         '../../base/base.gyp:base'
       ],
       'sources': [
         'public/user_agent.h',
         'public/user_agent.mm',
       ],
     },
   ],
 }