Remove --force-compositing-mode from various places. The flag no longer does anything.

BUG=

Review URL: https://codereview.chromium.org/363503002

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

8 files changed, 4 insertions, 12 deletions

diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index 83ab50c..be1a970 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -213,7 +213,7 @@ bool IsDelegatedRendererEnabled() {
   if (enabled && !IsThreadedCompositingEnabled()) {
     enabled = false;
     LOG(ERROR) << "Disabling delegated-rendering because it needs "
-               << "force-compositing-mode and threaded-compositing.";
+               << "threaded-compositing.";
   }
 
   return enabled;
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
index 1f0586c..e831e06 100644
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -259,9 +259,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
             shell()->web_contents()->GetVisibleURL());
 }
 
-// TODO(shrikant): enable this for Windows when issue with
-// force-compositing-mode is resolved (http://crbug.com/281726).
-// Also crashes under ThreadSanitizer, http://crbug.com/356758.
+// Crashes under ThreadSanitizer, http://crbug.com/356758.
 #if defined(OS_WIN) || defined(OS_ANDROID) \
     || defined(THREAD_SANITIZER)
 #define MAYBE_GetSizeForNewRenderView DISABLED_GetSizeForNewRenderView
diff --git a/content/test/gpu/gpu_tests/gpu_rasterization.py b/content/test/gpu/gpu_tests/gpu_rasterization.py
index a4b427e..ab82449 100644
--- a/content/test/gpu/gpu_tests/gpu_rasterization.py
+++ b/content/test/gpu/gpu_tests/gpu_rasterization.py
@@ -29,8 +29,7 @@ def _DidTestSucceed(tab):
 
 class _GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase):
   def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs(['--force-compositing-mode',
-                                    '--enable-threaded-compositing',
+    options.AppendExtraBrowserArgs(['--enable-threaded-compositing',
                                     '--enable-impl-side-painting',
                                     '--force-gpu-rasterization',
                                     '--enable-gpu-benchmarking'])
diff --git a/tools/perf/benchmarks/silk_flags.py b/tools/perf/benchmarks/silk_flags.py
index dfdd57c..5a4080e 100644
--- a/tools/perf/benchmarks/silk_flags.py
+++ b/tools/perf/benchmarks/silk_flags.py
@@ -10,6 +10,5 @@ def CustomizeBrowserOptionsForFastPath(options):
 def CustomizeBrowserOptionsForGpuRasterization(options):
   """Enables flags needed for forced GPU rasterization using Ganesh."""
   options.AppendExtraBrowserArgs('--enable-threaded-compositing')
-  options.AppendExtraBrowserArgs('--force-compositing-mode')
   options.AppendExtraBrowserArgs('--enable-impl-side-painting')
   options.AppendExtraBrowserArgs('--force-gpu-rasterization')
diff --git a/tools/perf/measurements/rasterize_and_record_micro.py b/tools/perf/measurements/rasterize_and_record_micro.py
index d1182e1..d5db15b 100644
--- a/tools/perf/measurements/rasterize_and_record_micro.py
+++ b/tools/perf/measurements/rasterize_and_record_micro.py
@@ -39,7 +39,6 @@ class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs([
         '--enable-impl-side-painting',
-        '--force-compositing-mode',
         '--enable-threaded-compositing',
         '--enable-gpu-benchmarking'
     ])
diff --git a/tools/perf/measurements/record_per_area.py b/tools/perf/measurements/record_per_area.py
index ef7686a..5370796 100644
--- a/tools/perf/measurements/record_per_area.py
+++ b/tools/perf/measurements/record_per_area.py
@@ -21,7 +21,6 @@ class RecordPerArea(page_measurement.PageMeasurement):
     smoothness.Smoothness.CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs([
         '--enable-impl-side-painting',
-        '--force-compositing-mode',
         '--enable-threaded-compositing',
         '--enable-gpu-benchmarking'
     ])
diff --git a/tools/perf/measurements/skpicture_printer.py b/tools/perf/measurements/skpicture_printer.py
index de2a761..2bf7940 100644
--- a/tools/perf/measurements/skpicture_printer.py
+++ b/tools/perf/measurements/skpicture_printer.py
@@ -25,8 +25,7 @@ class SkpicturePrinter(page_measurement.PageMeasurement):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs(['--enable-gpu-benchmarking',
                                     '--no-sandbox',
-                                    '--enable-deferred-image-decoding',
-                                    '--force-compositing-mode'])
+                                    '--enable-deferred-image-decoding'])
 
   def MeasurePage(self, page, tab, results):
     if tab.browser.platform.GetOSName() in ['android', 'chromeos']:
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
index 94a53cc..b482a6a 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
@@ -73,7 +73,6 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
             '--enable-smooth-scrolling',
             '--enable-threaded-compositing',
             '--enable-per-tile-painting',
-            '--force-compositing-mode',
             # Disables the start page, as well as other external apps that can
             # steal focus or make measurements inconsistent.
             '--disable-default-apps',