Revert "Reland of Default enable main frame before activation and remove finch experiment. (patchse…

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/compositor_util.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 297 matching lines @@
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   if (command_line.HasSwitch(cc::switches::kDisableMainFrameBeforeActivation))
     return false;
 
   if (command_line.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation))
     return true;
 
-  return true;
+  return base::FeatureList::IsEnabled(features::kMainFrameBeforeActivation);
 }
 
 base::DictionaryValue* GetFeatureStatus() {
   GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
   std::string gpu_access_blocked_reason;
   bool gpu_access_blocked =
       !manager->GpuAccessAllowed(&gpu_access_blocked_reason);
 
   base::DictionaryValue* feature_status_dict = new base::DictionaryValue();
 
@@ skipping 84 matching lines @@
     }
   }
   return problem_list;
 }
 
 std::vector<std::string> GetDriverBugWorkarounds() {
   return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
 }
 
 }  // namespace content