Revert of Use Surfaces on Windows, Linux, and Mac OS (try #3) (patchset #1...

Revert of Use Surfaces on Windows, Linux, and Mac OS (try #3) (patchset #1 id:1 of https://codereview.chromium.org/786243003/)

Reason for revert:
May be causing some browser_tests to flake:

http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34159
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34157
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34156
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34152
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34150
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/34149

Original issue's description:
> Use Surfaces on Windows, Linux, and Mac OS (try #3)
>
> Surfaces should be feature-complete, so try enabling them on Windows, Linux, and Mac OS. They're still disabled on Chrome OS because they rely on single-threaded browser compositing, and on Android because they haven't been implemented there yet.
>
> BUG=334090
> TBR=piman@chromium.org
>
> Committed: https://crrev.com/7fa9d3f715573c22081f11238a4ccf44bc0efb19
> Cr-Commit-Position: refs/heads/master@{#309998}

TBR=
NOTREECHECKS=true
NOTRY=true
BUG=334090

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

Cr-Commit-Position: refs/heads/master@{#310186}

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -92,7 +92,6 @@ std::string DeriveCommandLine(const GURL& start_url,
     ::switches::kDisablePanelFitting,
     ::switches::kDisableSeccompFilterSandbox,
     ::switches::kDisableSetuidSandbox,
-    ::switches::kDisableSurfaces,
     ::switches::kDisableTextBlobs,
     ::switches::kDisableThreadedScrolling,
     ::switches::kDisableTouchDragDrop,

content/browser/gpu/compositor_util.cc

@@ -283,19 +283,12 @@ bool IsForceGpuRasterizationEnabled() {
 bool UseSurfacesEnabled() {
 #if defined(OS_ANDROID)
   return false;
-#endif
-  bool enabled = false;
-#if (defined(USE_AURA) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-  enabled = true;
-#endif
-
+#else
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
-  // Flags override.
-  enabled |= command_line.HasSwitch(switches::kUseSurfaces);
-  enabled &= !command_line.HasSwitch(switches::kDisableSurfaces);
-  return enabled;
+  return command_line.HasSwitch(switches::kUseSurfaces);
+#endif
 }
 
 base::DictionaryValue* GetFeatureStatus() {

content/public/common/content_switches.cc

@@ -838,9 +838,6 @@ const char kUseNormalPriorityForTileTaskWorkerThreads[] =
 // Use the new surfaces system to handle compositor delegation.
 const char kUseSurfaces[] = "use-surfaces";
 
-// Disable the use of the new surfaces system to handle compositor delegation.
-const char kDisableSurfaces[] = "disable-surfaces";
-
 // On POSIX only: the contents of this flag are prepended to the utility
 // process command line. Useful values might be "valgrind" or "xterm -e gdb
 // --args".

content/public/common/content_switches.h

@@ -233,7 +233,6 @@ extern const char kUseImageTextureTarget[];
 CONTENT_EXPORT extern const char kUseMobileUserAgent[];
 CONTENT_EXPORT extern const char kUseNormalPriorityForTileTaskWorkerThreads[];
 extern const char kUseSurfaces[];
-CONTENT_EXPORT extern const char kDisableSurfaces[];
 extern const char kUtilityCmdPrefix[];
 CONTENT_EXPORT extern const char kUtilityProcess[];
 extern const char kUtilityProcessAllowedDir[];