2f22f03 - platform/external/chromium_org

commit	2f22f038970e0d1927c41b04bbf5589bd12c5316	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Tue Jul 01 14:26:10 2014 +0100
committer	Torne (Richard Coles) <torne@google.com>	Tue Jul 01 14:26:10 2014 +0100
tree	15ae69a6496c31f7a00fed54dd22af04dcc8fb81
parent	770300fb3fec927eb702b146c92281093e917c72 [diff]

Merge from Chromium at DEPS revision 37.0.2062.10

This commit was generated by merge_to_master.py.

Change-Id: I7a3a1838fe1d01e3d29886fc52aa980c2c3f2783

DEPS[diff]
GypAndroid.darwin-arm64.mk[diff]
GypAndroid.darwin-mips.mk[diff]
GypAndroid.linux-arm64.mk[diff]
GypAndroid.linux-mips.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk[diff]
android_webview/browser/aw_browser_permission_request_delegate.h[diff]
android_webview/browser/aw_content_browser_client.cc[diff]
android_webview/browser/aw_contents_client_bridge_base.h[diff]
android_webview/browser/browser_view_renderer.cc[diff]
android_webview/browser/browser_view_renderer.h[diff]
android_webview/browser/shared_renderer_state.cc[diff]
android_webview/browser/shared_renderer_state.h[diff]
android_webview/java/src/org/chromium/android_webview/AwContents.java[diff]
android_webview/libwebviewchromium.target.darwin-arm64.mk[diff]
android_webview/libwebviewchromium.target.darwin-mips.mk[diff]
android_webview/libwebviewchromium.target.linux-arm64.mk[diff]
android_webview/libwebviewchromium.target.linux-mips.mk[diff]
android_webview/native/aw_contents.cc[diff]
android_webview/native/aw_contents.h[diff]
android_webview/native/aw_contents_client_bridge.cc[diff]
android_webview/native/aw_contents_client_bridge.h[diff]
android_webview/native/aw_dev_tools_server.cc[diff]
android_webview/native/permission/protected_media_id_permission_request.cc[Deleted - diff]
android_webview/native/permission/protected_media_id_permission_request.h[Deleted - diff]
android_webview/native/permission/simple_permission_request.cc[Added - diff]
android_webview/native/permission/simple_permission_request.h[Added - diff]
android_webview/native/webview_native.gyp[diff]
android_webview/native/webview_native.target.darwin-arm.mk[diff]
android_webview/native/webview_native.target.darwin-arm64.mk[diff]
android_webview/native/webview_native.target.darwin-mips.mk[diff]
android_webview/native/webview_native.target.darwin-x86.mk[diff]
android_webview/native/webview_native.target.darwin-x86_64.mk[diff]
android_webview/native/webview_native.target.linux-arm.mk[diff]
android_webview/native/webview_native.target.linux-arm64.mk[diff]
android_webview/native/webview_native.target.linux-mips.mk[diff]
android_webview/native/webview_native.target.linux-x86.mk[diff]
android_webview/native/webview_native.target.linux-x86_64.mk[diff]
base/sys_info_android.cc[diff]
base/test/multiprocess_test_android.cc[diff]
build/common.gypi[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
cc/BUILD.gn[diff]
cc/cc.gyp[diff]
cc/cc.target.darwin-arm.mk[diff]
cc/cc.target.darwin-arm64.mk[diff]
cc/cc.target.darwin-mips.mk[diff]
cc/cc.target.darwin-x86.mk[diff]
cc/cc.target.darwin-x86_64.mk[diff]
cc/cc.target.linux-arm.mk[diff]
cc/cc.target.linux-arm64.mk[diff]
cc/cc.target.linux-mips.mk[diff]
cc/cc.target.linux-x86.mk[diff]
cc/cc.target.linux-x86_64.mk[diff]
cc/cc_tests.gyp[diff]
cc/layers/heads_up_display_layer_impl.cc[diff]
cc/resources/memory_history.cc[diff]
cc/resources/memory_history.h[diff]
cc/resources/prioritized_tile_set.cc[Added - diff]
cc/resources/prioritized_tile_set.h[Added - diff]
cc/resources/prioritized_tile_set_unittest.cc[Added - diff]
cc/resources/tile.cc[diff]
cc/resources/tile.h[diff]
cc/resources/tile_manager.cc[diff]
cc/resources/tile_manager.h[diff]
cc/resources/tile_manager_unittest.cc[diff]
cc/resources/tile_priority.h[diff]
cc/test/fake_tile_manager.cc[diff]
cc/test/fake_tile_manager.h[diff]
cc/trees/layer_tree_host_impl.cc[diff]
cc/trees/layer_tree_host_impl_unittest.cc[diff]
chrome/VERSION[diff]
chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/Tab.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java[diff]
chrome/app/chromeos_strings.grdp[diff]
chrome/app/generated_resources.grd[diff]
chrome/app/resources/locale_settings_win.grd[diff]
chrome/browser/android/bookmarks/bookmarks_bridge.cc[diff]
chrome/browser/android/bookmarks/bookmarks_bridge.h[diff]
chrome/browser/android/omnibox/answers_image_bridge.cc[diff]
chrome/browser/android/url_utilities.cc[diff]
chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc[diff]
chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc[diff]
chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc[diff]
chrome/browser/chromeos/file_manager/volume_manager.cc[diff]
chrome/browser/chromeos/login/reset_browsertest.cc[diff]
chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc[diff]
chrome/browser/chromeos/policy/device_local_account_extension_tracker.cc[Added - diff]
chrome/browser/chromeos/policy/device_local_account_extension_tracker.h[Added - diff]
chrome/browser/chromeos/policy/device_local_account_policy_service.cc[diff]
chrome/browser/chromeos/policy/device_local_account_policy_service.h[diff]
chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc[diff]
chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.cc[diff]
chrome/browser/chromeos/policy/wildcard_login_checker.cc[diff]
chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc[diff]
chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc[diff]
chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc[diff]
chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h[diff]
chrome/browser/extensions/api/identity/identity_api.cc[diff]
chrome/browser/extensions/api/identity/identity_apitest.cc[diff]
chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc[diff]
chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc[diff]
chrome/browser/printing/print_view_manager_base.cc[diff]
chrome/browser/profiles/profile_downloader.cc[diff]
chrome/browser/profiles/profile_downloader.h[diff]
chrome/browser/profiles/profile_downloader_unittest.cc[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/api_implementation.js[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/externs.js[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions.js[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js[diff]
chrome/browser/resources/chromeos/chromevox/common/braille_util.js[diff]
chrome/browser/resources/chromeos/chromevox/common/dom_util.js[diff]
chrome/browser/resources/chromeos/chromevox/common/nav_description.js[diff]
chrome/browser/resources/chromeos/chromevox/common/nav_math_description.js[diff]
chrome/browser/resources/chromeos/chromevox/host/chrome/braille_input_handler.js[diff]
chrome/browser/resources/chromeos/chromevox/host/chrome/braille_key_types.js[diff]
chrome/browser/resources/chromeos/chromevox/host/chrome/externs.js[diff]
chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background.js[diff]
chrome/browser/resources/chromeos/chromevox/host/interface/abstract_tts.js[diff]
chrome/browser/resources/chromeos/chromevox/liblouis_nacl/liblouis.js[diff]
chrome/browser/signin/account_reconcilor_unittest.cc[diff]
chrome/browser/sync/test/integration/sync_test.cc[diff]
chrome/browser/sync_file_system/drive_backend/register_app_task.cc[diff]
chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc[diff]
chrome/browser/ui/prefs/prefs_tab_helper.cc[diff]
chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc[diff]
chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc[diff]
chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h[diff]
chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc[diff]
chrome/browser/ui/window_sizer/window_sizer.cc[diff]
chrome/chrome_browser_chromeos.gypi[diff]
chrome/common/extensions/api/_api_features.json[diff]
chrome/common/extensions/api/_permission_features.json[diff]
chrome/third_party/chromevox/chromeVoxChromeBackgroundScript.js[diff]
chrome/third_party/chromevox/chromeVoxChromeOptionsScript.js[diff]
chrome/third_party/chromevox/chromeVoxChromePageScript.js[diff]
chrome/third_party/chromevox/chromeVoxKbExplorerScript.js[diff]
chrome_elf/blacklist/blacklist.cc[diff]
chromeos/chromeos_switches.cc[diff]
chromeos/chromeos_switches.h[diff]
chromeos/dbus/session_manager_client.cc[diff]
chromeos/network/onc/onc_validator.cc[diff]
chromeos/network/onc/onc_validator_unittest.cc[diff]
chromeos/network/shill_property_handler.cc[diff]
chromeos/test/data/network/toplevel_empty.onc[Added - diff]
chromeos/test/data/network/toplevel_only_global_config.onc[Added - diff]
components/onc/docs/onc_spec.html[diff]
components/policy/core/common/cloud/cloud_policy_client_registration_helper.cc[diff]
components/policy/core/common/cloud/component_cloud_policy_service.cc[diff]
components/policy/core/common/cloud/component_cloud_policy_service.h[diff]
components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc[diff]
components/policy/core/common/cloud/user_info_fetcher.cc[diff]
components/policy/core/common/cloud/user_info_fetcher.h[diff]
components/policy/core/common/cloud/user_info_fetcher_unittest.cc[diff]
components/policy/core/common/forwarding_policy_provider_unittest.cc[diff]
components/policy/core/common/schema_map.cc[diff]
components/policy/core/common/schema_map_unittest.cc[diff]
components/policy/core/common/schema_registry.cc[diff]
components/policy/core/common/schema_registry_unittest.cc[diff]
content/browser/android/web_contents_observer_android.cc[diff]
content/browser/android/web_contents_observer_android.h[diff]
content/browser/bootstrap_sandbox_mac.cc[diff]
content/browser/devtools/devtools_tracing_handler.cc[diff]
content/browser/devtools/devtools_tracing_handler.h[diff]
content/browser/renderer_host/compositing_iosurface_layer_mac.mm[diff]
content/child/child_thread.cc[diff]
content/child/runtime_features.cc[diff]
content/common_aidl.target.darwin-arm.mk[diff]
content/common_aidl.target.darwin-arm64.mk[diff]
content/common_aidl.target.darwin-mips.mk[diff]
content/common_aidl.target.darwin-x86.mk[diff]
content/common_aidl.target.darwin-x86_64.mk[diff]
content/common_aidl.target.linux-arm.mk[diff]
content/common_aidl.target.linux-arm64.mk[diff]
content/common_aidl.target.linux-mips.mk[diff]
content/common_aidl.target.linux-x86.mk[diff]
content/common_aidl.target.linux-x86_64.mk[diff]
content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java[diff]
google_apis/gaia/fake_gaia.cc[diff]
google_apis/gaia/gaia_constants.cc[diff]
google_apis/gaia/gaia_constants.h[diff]
google_apis/gaia/gaia_oauth_client.cc[diff]
google_apis/gaia/gaia_oauth_client.h[diff]
google_apis/gaia/gaia_oauth_client_unittest.cc[diff]
google_apis/gaia/gaia_urls.cc[diff]
google_apis/gaia/gaia_urls.h[diff]
gpu/config/gpu_control_list.cc[diff]
gpu/config/gpu_control_list_os_info_unittest.cc[diff]
media/base/android/java/src/org/chromium/media/MediaDrmBridge.java[diff]
media/base/android/media_drm_bridge.cc[diff]
media/base/demuxer.h[diff]
media/base/mock_filters.h[diff]
media/base/pipeline.cc[diff]
media/base/pipeline_unittest.cc[diff]
media/filters/audio_decoder_unittest.cc[Deleted - diff]
media/filters/audio_file_reader.cc[diff]
media/filters/audio_file_reader.h[diff]
media/filters/audio_file_reader_unittest.cc[diff]
media/filters/chunk_demuxer.cc[diff]
media/filters/chunk_demuxer.h[diff]
media/filters/ffmpeg_audio_decoder.cc[diff]
media/filters/ffmpeg_audio_decoder_unittest.cc[Added - diff]
media/filters/ffmpeg_demuxer.cc[diff]
media/filters/ffmpeg_demuxer.h[diff]
media/filters/ffmpeg_demuxer_unittest.cc[diff]
media/filters/opus_audio_decoder.cc[diff]
media/filters/opus_audio_decoder_unittest.cc[Added - diff]
media/media.gyp[diff]
net/quic/quic_http_stream.cc[diff]
net/quic/quic_http_stream.h[diff]
net/quic/quic_http_stream_test.cc[diff]
remoting/remoting_client.gypi[diff]
remoting/remoting_webapp.gypi[diff]
remoting/webapp/client_plugin.js[diff]
remoting/webapp/event_handlers.js[diff]
remoting/webapp/identity.js[diff]
remoting/webapp/js_proto/chrome_proto.js[diff]
tools/android/adb_reboot/adb_reboot.c[diff]

242 files changed