Enabling new FRE and launch flow by default on Win 10.

chrome/browser/ui/startup/startup_features.cc

 // Copyright 2016 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 "chrome/browser/ui/startup/startup_features.h"
 
 namespace features {
 
 const base::Feature kUseConsolidatedStartupFlow{
     "UseConsolidatedStartupFlow", base::FEATURE_ENABLED_BY_DEFAULT};
 
 #if defined(OS_WIN)
-const base::Feature kWelcomeWin10InlineStyle{"WelcomeWin10InlineStyle",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kEnableWelcomeWin10{
+    "EnableWelcomeWin10", base::FEATURE_ENABLED_BY_DEFAULT};
+
+const base::Feature kWelcomeWin10InlineStyle{
+    "WelcomeWin10InlineStyle", base::FEATURE_ENABLED_BY_DEFAULT};

[Peter Kasting, 2017/02/01 02:09:51]

Nit: Did git cl format change the wrapping here?  I kinda thought the old
wrapping was better, but not enough to try and override git cl format

[tmartino, 2017/02/01 21:04:33]

Yeah, this was git cl format.

 #endif
 
 }  // namespace features