9a50bf91c7243a36312163b225512df8e7f96d44 - chromium/src

commit	9a50bf91c7243a36312163b225512df8e7f96d44	[log] [tgz]
author	michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Thu May 09 05:39:51 2013
committer	michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Thu May 09 05:39:51 2013
tree	5b2c10cb2d16f59819c57083572d0dbf176d1439
parent	38d28206783f7a509839b29bb9b315b5c92676b8 [diff]

Made the following changes to enable merge mode

- only set EnableWebViewSynchronousAPIs in unmerge mode
- Allow wait in UI thread
- Disable 8 unit tests since SW renderer didn't work.


BUG=235702, 239144, 238735

Review URL: https://chromiumcodereview.appspot.com/13907007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199128 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/browser/browser_view_renderer_impl.cc[diff]
android_webview/browser/renderer_host/view_renderer_host.cc[diff]
android_webview/common/aw_switches.cc[diff]
android_webview/common/aw_switches.h[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java[diff]
android_webview/lib/main/aw_main_delegate.cc[diff]

9 files changed