diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 18:14:16 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 18:14:16 +0000 |
| commit | 5aaa13e55e626e1cfe1aa84822d96adec0bff816 (patch) | |
| tree | e3d66d5971cf87e9bce95564d61ae315371a421c /content | |
| parent | e6cbe134b6329692a719e204ea5c39ca9913fa06 (diff) | |
| download | chromium_src-5aaa13e55e626e1cfe1aa84822d96adec0bff816.zip chromium_src-5aaa13e55e626e1cfe1aa84822d96adec0bff816.tar.gz chromium_src-5aaa13e55e626e1cfe1aa84822d96adec0bff816.tar.bz2 | |
Merge 173883
> Comment out flag added in 173634 to work around flaky Android tests.
>
> NOTRY=true
> TBR=tedchoc
>
> BUG=161945
>
>
> Review URL: https://chromiumcodereview.appspot.com/11636013
TBR=aelias@chromium.org
Review URL: https://codereview.chromium.org/11637041
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@174186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/android/content_startup_flags.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc index c22bed5..825c3f9 100644 --- a/content/browser/android/content_startup_flags.cc +++ b/content/browser/android/content_startup_flags.cc @@ -62,8 +62,9 @@ void SetContentCommandLineFlags(int max_render_process_count) { parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); parsed_command_line->AppendSwitch(switches::kEnableViewport); - parsed_command_line->AppendSwitch( - cc::switches::kEnableCompositorFrameMessage); + // FIXME(aelias): Commented out due to flaky tests. +// parsed_command_line->AppendSwitch( +// cc::switches::kEnableCompositorFrameMessage); } } // namespace content |