Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

11 files changed, 44 insertions, 43 deletions

diff --git a/chromium/chrome/chrome_browser.gypi b/chromium/chrome/chrome_browser.gypi
index 25e053faa72..b31118d7de3 100644
--- a/chromium/chrome/chrome_browser.gypi
+++ b/chromium/chrome/chrome_browser.gypi
@@ -770,6 +770,8 @@
         'browser/history/in_memory_url_index_types.h',
         'browser/history/most_visited_tiles_experiment.cc',
         'browser/history/most_visited_tiles_experiment.h',
+        'browser/history/page_collector.cc',
+        'browser/history/page_collector.h',
         'browser/history/page_usage_data.cc',
         'browser/history/page_usage_data.h',
         'browser/history/query_parser.cc',
@@ -970,8 +972,6 @@
         'browser/media/chrome_midi_permission_context.h',
         'browser/media/chrome_midi_permission_context_factory.cc',
         'browser/media/chrome_midi_permission_context_factory.h',
-        'browser/media/desktop_streams_registry.cc',
-        'browser/media/desktop_streams_registry.h',
         'browser/media/desktop_media_picker.h',
         'browser/media/desktop_media_picker_model.cc',
         'browser/media/desktop_media_picker_model.h',
@@ -1641,6 +1641,8 @@
         'browser/profiles/chrome_browser_main_extra_parts_profiles.h',
         'browser/profiles/chrome_version_service.cc',
         'browser/profiles/chrome_version_service.h',
+        'browser/profiles/file_path_verifier_win.cc',
+        'browser/profiles/file_path_verifier_win.h',
         'browser/profiles/gaia_info_update_service.cc',
         'browser/profiles/gaia_info_update_service.h',
         'browser/profiles/gaia_info_update_service_factory.cc',
diff --git a/chromium/chrome/chrome_browser_chromeos.gypi b/chromium/chrome/chrome_browser_chromeos.gypi
index 6a8668be57c..982b46c3ed7 100644
--- a/chromium/chrome/chrome_browser_chromeos.gypi
+++ b/chromium/chrome/chrome_browser_chromeos.gypi
@@ -319,7 +319,6 @@
         'browser/chromeos/extensions/external_cache.h',
         'browser/chromeos/extensions/external_pref_cache_loader.cc',
         'browser/chromeos/extensions/external_pref_cache_loader.h',
-        'browser/chromeos/extensions/file_manager/app_id.h',
         'browser/chromeos/extensions/file_manager/desktop_notifications.cc',
         'browser/chromeos/extensions/file_manager/desktop_notifications.h',
         'browser/chromeos/extensions/file_manager/event_router.cc',
@@ -336,8 +335,6 @@
         'browser/chromeos/extensions/file_manager/fileapi_util.h',
         'browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc',
         'browser/chromeos/extensions/file_manager/mounted_disk_monitor.h',
-        'browser/chromeos/extensions/file_manager/url_util.cc',
-        'browser/chromeos/extensions/file_manager/url_util.h',
         'browser/chromeos/extensions/file_manager/zip_file_creator.cc',
         'browser/chromeos/extensions/file_manager/zip_file_creator.h',
         'browser/chromeos/extensions/info_private_api.cc',
@@ -575,8 +572,6 @@
         'browser/chromeos/login/user_image_manager.cc',
         'browser/chromeos/login/user_image_manager_impl.cc',
         'browser/chromeos/login/user_image_manager_impl.h',
-        'browser/chromeos/login/user_image_sync_observer.cc',
-        'browser/chromeos/login/user_image_sync_observer.h',
         'browser/chromeos/login/user_flow.cc',
         'browser/chromeos/login/user_flow.h',
         'browser/chromeos/login/user_manager.cc',
@@ -761,6 +756,8 @@
         'browser/chromeos/settings/system_settings_provider.h',
         'browser/chromeos/sim_dialog_delegate.cc',
         'browser/chromeos/sim_dialog_delegate.h',
+        'browser/chromeos/sms_observer.cc',
+        'browser/chromeos/sms_observer.h',
         'browser/chromeos/status/data_promo_notification.cc',
         'browser/chromeos/status/data_promo_notification.h',
         'browser/chromeos/status/network_menu.cc',
diff --git a/chromium/chrome/chrome_browser_extensions.gypi b/chromium/chrome/chrome_browser_extensions.gypi
index c477498338d..e61183b56fb 100644
--- a/chromium/chrome/chrome_browser_extensions.gypi
+++ b/chromium/chrome/chrome_browser_extensions.gypi
@@ -197,8 +197,6 @@
         'browser/extensions/api/declarative_webrequest/webrequest_constants.h',
         'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc',
         'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h',
-        'browser/extensions/api/desktop_capture/desktop_capture_api.cc',
-        'browser/extensions/api/desktop_capture/desktop_capture_api.h',
         'browser/extensions/api/developer_private/developer_private_api.cc',
         'browser/extensions/api/developer_private/developer_private_api.h',
         'browser/extensions/api/developer_private/developer_private_api_factory.cc',
diff --git a/chromium/chrome/chrome_browser_ui.gypi b/chromium/chrome/chrome_browser_ui.gypi
index da33a8efeeb..a869a13bfbc 100644
--- a/chromium/chrome/chrome_browser_ui.gypi
+++ b/chromium/chrome/chrome_browser_ui.gypi
@@ -182,10 +182,6 @@
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
-        'browser/ui/apps/app_metro_infobar_delegate_win.cc',
-        'browser/ui/apps/app_metro_infobar_delegate_win.h',
-        'browser/ui/apps/apps_metro_handler_win.cc',
-        'browser/ui/apps/apps_metro_handler_win.h',
         'browser/ui/apps/chrome_shell_window_delegate.cc',
         'browser/ui/apps/chrome_shell_window_delegate.h',
         'browser/ui/ash/ash_keyboard_controller_proxy.cc',
@@ -696,8 +692,6 @@
         'browser/ui/cocoa/fullscreen_exit_bubble_controller.mm',
         'browser/ui/cocoa/fullscreen_exit_bubble_view.h',
         'browser/ui/cocoa/fullscreen_exit_bubble_view.mm',
-        'browser/ui/cocoa/fullscreen_mode_controller.h',
-        'browser/ui/cocoa/fullscreen_mode_controller.mm',
         'browser/ui/cocoa/fullscreen_window.h',
         'browser/ui/cocoa/fullscreen_window.mm',
         'browser/ui/cocoa/global_error_bubble_controller.h',
@@ -782,8 +776,6 @@
         'browser/ui/cocoa/location_bar/location_bar_view_mac.mm',
         'browser/ui/cocoa/location_bar/location_icon_decoration.h',
         'browser/ui/cocoa/location_bar/location_icon_decoration.mm',
-        'browser/ui/cocoa/location_bar/mic_search_decoration.h',
-        'browser/ui/cocoa/location_bar/mic_search_decoration.mm',
         'browser/ui/cocoa/location_bar/page_action_decoration.h',
         'browser/ui/cocoa/location_bar/page_action_decoration.mm',
         'browser/ui/cocoa/location_bar/selected_keyword_decoration.h',
@@ -986,8 +978,12 @@
         'browser/ui/crypto_module_password_dialog.h',
         'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/crypto_module_password_dialog_openssl.cc',
+        'browser/ui/extensions/app_metro_infobar_delegate_win.cc',
+        'browser/ui/extensions/app_metro_infobar_delegate_win.h',
         'browser/ui/extensions/application_launch.cc',
         'browser/ui/extensions/application_launch.h',
+        'browser/ui/extensions/apps_metro_handler_win.cc',
+        'browser/ui/extensions/apps_metro_handler_win.h',
         'browser/ui/extensions/extension_install_ui_default.cc',
         'browser/ui/extensions/extension_install_ui_default.h',
         'browser/ui/extensions/extension_enable_flow.cc',
@@ -1989,6 +1985,8 @@
         'browser/ui/webui/chrome_web_contents_handler.h',
         'browser/ui/webui/chrome_web_ui_controller_factory.cc',
         'browser/ui/webui/chrome_web_ui_controller_factory.h',
+        'browser/ui/webui/chromeos/about_network.cc',
+        'browser/ui/webui/chromeos/about_network.h',
         'browser/ui/webui/chromeos/app_launch_ui.cc',
         'browser/ui/webui/chromeos/app_launch_ui.h',
         'browser/ui/webui/chromeos/bluetooth_pairing_ui.cc',
@@ -2054,8 +2052,6 @@
         'browser/ui/webui/chromeos/mobile_setup_dialog.h',
         'browser/ui/webui/chromeos/mobile_setup_ui.cc',
         'browser/ui/webui/chromeos/mobile_setup_ui.h',
-        'browser/ui/webui/chromeos/network_ui.cc',
-        'browser/ui/webui/chromeos/network_ui.h',
         'browser/ui/webui/chromeos/proxy_settings_ui.cc',
         'browser/ui/webui/chromeos/proxy_settings_ui.h',
         'browser/ui/webui/chromeos/sim_unlock_ui.cc',
@@ -2136,6 +2132,10 @@
         'browser/ui/webui/inspect_ui.h',
         'browser/ui/webui/instant_ui.cc',
         'browser/ui/webui/instant_ui.h',
+        'browser/ui/webui/local_discovery/local_discovery_ui.cc',
+        'browser/ui/webui/local_discovery/local_discovery_ui.h',
+        'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
+        'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
         'browser/ui/webui/media/webrtc_logs_ui.cc',
         'browser/ui/webui/media/webrtc_logs_ui.h',
         'browser/ui/webui/memory_internals/memory_internals_handler.cc',
@@ -3110,14 +3110,6 @@
             'browser/ui/webui/media/webrtc_logs_ui.h',
           ],
         }],
-        ['enable_mdns==1', {
-          'sources': [
-            'browser/ui/webui/local_discovery/local_discovery_ui.cc',
-            'browser/ui/webui/local_discovery/local_discovery_ui.h',
-            'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
-            'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
-          ],
-        }],
       ],
     },
   ],
diff --git a/chromium/chrome/chrome_common.gypi b/chromium/chrome/chrome_common.gypi
index ed7b021f152..c29bd660305 100644
--- a/chromium/chrome/chrome_common.gypi
+++ b/chromium/chrome/chrome_common.gypi
@@ -37,8 +37,6 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
-        '<(DEPTH)/components/components.gyp:json_schema',
-        '<(DEPTH)/components/components.gyp:policy_component',
         '<(DEPTH)/components/components.gyp:visitedlink_common',
         '<(DEPTH)/content/content.gyp:content_common',
         '<(DEPTH)/net/net.gyp:net',
@@ -80,8 +78,6 @@
         '../extensions/common/id_util.h',
         '../extensions/common/install_warning.cc',
         '../extensions/common/install_warning.h',
-        '../extensions/common/manifest_constants.cc',
-        '../extensions/common/manifest_constants.h',
         '../extensions/common/matcher/regex_set_matcher.cc',
         '../extensions/common/matcher/regex_set_matcher.h',
         '../extensions/common/matcher/string_pattern.cc',
@@ -377,6 +373,10 @@
         'common/instant_restricted_id_cache.h',
         'common/instant_types.cc',
         'common/instant_types.h',
+        'common/json_schema/json_schema_constants.cc',
+        'common/json_schema/json_schema_constants.h',
+        'common/json_schema/json_schema_validator.cc',
+        'common/json_schema/json_schema_validator.h',
         'common/localized_error.cc',
         'common/localized_error.h',
         'common/logging_chrome.cc',
@@ -426,6 +426,8 @@
         'common/pepper_flash.h',
         'common/pepper_permission_util.cc',
         'common/pepper_permission_util.h',
+        'common/policy/policy_schema.cc',
+        'common/policy/policy_schema.h',
         'common/pref_names_util.cc',
         'common/pref_names_util.h',
         'common/print_messages.cc',
@@ -591,9 +593,12 @@
         }],
         ['OS=="win"', {
           'include_dirs': [
-            '<(DEPTH)/breakpad/src',
             '<(DEPTH)/third_party/wtl/include',
           ],
+          'sources!': [
+            'common/crash_keys.cc',
+            'common/crash_keys.h',
+          ],
         }],
         ['enable_mdns == 1', {
             'sources': [
diff --git a/chromium/chrome/chrome_renderer.gypi b/chromium/chrome/chrome_renderer.gypi
index 5b0d88cdd73..2fe5126e612 100644
--- a/chromium/chrome/chrome_renderer.gypi
+++ b/chromium/chrome/chrome_renderer.gypi
@@ -278,6 +278,7 @@
         'renderer/prerender/prerenderer_client.h',
         'renderer/printing/print_web_view_helper.cc',
         'renderer/printing/print_web_view_helper.h',
+        'renderer/printing/print_web_view_helper_android.cc',
         'renderer/printing/print_web_view_helper_linux.cc',
         'renderer/printing/print_web_view_helper_mac.mm',
         'renderer/printing/print_web_view_helper_win.cc',
diff --git a/chromium/chrome/chrome_tests.gypi b/chromium/chrome/chrome_tests.gypi
index 4a43df7a317..1a5ef06fb85 100644
--- a/chromium/chrome/chrome_tests.gypi
+++ b/chromium/chrome/chrome_tests.gypi
@@ -391,7 +391,6 @@
           'sources': [
             'browser/chromeos/cros/cros_in_process_browser_test.cc',
             'browser/chromeos/cros/cros_in_process_browser_test.h',
-            'browser/chromeos/input_method/keyboard_browsertest.cc',
             'browser/chromeos/input_method/textinput_browsertest.cc',
             'browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc',
             'browser/chromeos/input_method/textinput_test_helper.cc',
@@ -1210,8 +1209,11 @@
         'browser/chromeos/login/existing_user_controller_browsertest.cc',
         'browser/chromeos/login/kiosk_browsertest.cc',
         'browser/chromeos/login/login_utils_browsertest.cc',
+        'browser/chromeos/login/login_manager_test.cc',
+        'browser/chromeos/login/login_manager_test.h',
         'browser/chromeos/login/mock_authenticator.cc',
         'browser/chromeos/login/mock_authenticator.h',
+        'browser/chromeos/login/session_login_browsertest.cc',
         'browser/chromeos/login/screen_locker_tester.cc',
         'browser/chromeos/login/screen_locker_tester.h',
         'browser/chromeos/login/screens/mock_error_screen.cc',
@@ -2089,11 +2091,6 @@
             ['exclude', '^test/data/webui/print_preview.js'],
           ],
         }],
-        ['enable_mdns==1', {
-          'sources' : [
-            'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc',
-          ]
-        }],
       ],  # conditions
     },  # target browser_tests
     {
@@ -3276,6 +3273,7 @@
             '../base/base.gyp:base_java_test_support',
             '../content/content.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
+            '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'variables': {
             'apk_name': 'ChromiumTestShellTest',
diff --git a/chromium/chrome/chrome_tests_unit.gypi b/chromium/chrome/chrome_tests_unit.gypi
index 1cc82a06476..f7394c85850 100644
--- a/chromium/chrome/chrome_tests_unit.gypi
+++ b/chromium/chrome/chrome_tests_unit.gypi
@@ -655,7 +655,6 @@
         'browser/chromeos/extensions/file_manager/desktop_notifications_unittest.cc',
         'browser/chromeos/extensions/file_manager/file_tasks_unittest.cc',
         'browser/chromeos/extensions/file_manager/file_watcher_unittest.cc',
-        'browser/chromeos/extensions/file_manager/url_util_unittest.cc',
         'browser/chromeos/extensions/wallpaper_private_api_unittest.cc',
         'browser/chromeos/external_metrics_unittest.cc',
         'browser/chromeos/fileapi/file_access_permissions_unittest.cc',
@@ -767,7 +766,6 @@
         'browser/enumerate_modules_model_unittest_win.cc',
         'browser/extensions/active_tab_unittest.cc',
         'browser/extensions/activity_log/activity_database_unittest.cc',
-        'browser/extensions/activity_log/activity_log_enabled_unittest.cc',
         'browser/extensions/activity_log/activity_log_unittest.cc',
         'browser/extensions/activity_log/activity_log_policy_unittest.cc',
         'browser/extensions/activity_log/counting_policy_unittest.cc',
@@ -1090,6 +1088,7 @@
         'browser/prefs/chrome_pref_service_unittest.cc',
         'browser/prefs/command_line_pref_store_unittest.cc',
         'browser/prefs/incognito_mode_prefs_unittest.cc',
+        'browser/prefs/pref_metrics_service_unittest.cc',
         'browser/prefs/pref_model_associator_unittest.cc',
         'browser/prefs/proxy_config_dictionary_unittest.cc',
         'browser/prefs/proxy_policy_unittest.cc',
@@ -1112,6 +1111,7 @@
         'browser/process_singleton_mac_unittest.cc',
         'browser/profile_resetter/profile_resetter_unittest.cc',
         'browser/profiles/avatar_menu_model_unittest.cc',
+        'browser/profiles/file_path_verifier_win_unittest.cc',
         'browser/profiles/gaia_info_update_service_unittest.cc',
         'browser/profiles/off_the_record_profile_impl_unittest.cc',
         'browser/profiles/profile_downloader_unittest.cc',
@@ -1757,6 +1757,9 @@
         'common/favicon/favicon_url_parser_unittest.cc',
         'common/importer/firefox_importer_utils_unittest.cc',
         'common/instant_restricted_id_cache_unittest.cc',
+        'common/json_schema/json_schema_validator_unittest.cc',
+        'common/json_schema/json_schema_validator_unittest_base.cc',
+        'common/json_schema/json_schema_validator_unittest_base.h',
         'common/mac/cfbundle_blocker_unittest.mm',
         'common/mac/mock_launchd.cc',
         'common/mac/mock_launchd.h',
@@ -1774,6 +1777,7 @@
         'common/net/url_fixer_upper_unittest.cc',
         'common/net/x509_certificate_model_unittest.cc',
         'common/partial_circular_buffer_unittest.cc',
+        'common/policy/policy_schema_unittest.cc',
         'common/pref_names_util_unittest.cc',
         'common/service_process_util_unittest.cc',
         'common/switch_utils_unittest.cc',
diff --git a/chromium/chrome/common/extensions/api/api.gyp b/chromium/chrome/common/extensions/api/api.gyp
index 5c84ab1b881..465021ae042 100644
--- a/chromium/chrome/common/extensions/api/api.gyp
+++ b/chromium/chrome/common/extensions/api/api.gyp
@@ -39,7 +39,6 @@
           'cookies.json',
           'debugger.json',
           'developer_private.idl',
-          'desktop_capture.idl',
           'diagnostics.idl',
           'dial.idl',
           'downloads.idl',
diff --git a/chromium/chrome/installer/mini_installer.gyp b/chromium/chrome/installer/mini_installer.gyp
index 05d54d2875c..619c70e7b81 100644
--- a/chromium/chrome/installer/mini_installer.gyp
+++ b/chromium/chrome/installer/mini_installer.gyp
@@ -177,7 +177,13 @@
 
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
-          
+
+          'variables': {
+            # Opt out the common compatibility manifest to work around
+            # crbug.com/272660.
+            # TODO(yukawa): Enable the common compatibility manifest again.
+            'win_exe_compatibility_manifest': '',
+          },
           'sources': [
             'mini_installer/chrome.release',
             'mini_installer/chrome_appid.cc',
diff --git a/chromium/chrome/test/data/nacl/nacl_test_data.gyp b/chromium/chrome/test/data/nacl/nacl_test_data.gyp
index 52f4fca8829..4d8e4ecff20 100644
--- a/chromium/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chromium/chrome/test/data/nacl/nacl_test_data.gyp
@@ -146,7 +146,6 @@
           'pnacl_error_handling/bad.pexe',
           'pnacl_error_handling/pnacl_bad_pexe.nmf',
           'pnacl_error_handling/pnacl_bad_doesnotexist.nmf',
-          'pnacl_error_handling/pnacl_illformed_manifest.nmf',
         ],
       },
       'dependencies': [