[Payments] Put Web Payments feature on desktop behind flag

content/child/runtime_features.cc

 // Copyright 2013 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/child/runtime_features.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 301 matching lines @@
   WebRuntimeFeatures::enableTouchpadAndWheelScrollLatching(
       base::FeatureList::IsEnabled(features::kTouchpadAndWheelScrollLatching));
 
   if (base::FeatureList::IsEnabled(
           features::kSendBeaconThrowForBlobWithNonSimpleType))
     WebRuntimeFeatures::enableSendBeaconThrowForBlobWithNonSimpleType(true);
 
 #if defined(OS_ANDROID)
   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
     WebRuntimeFeatures::enableMediaSession(false);
+#endif

[please use gerrit instead, 2017/02/27 15:56:17]

I don't think this change is necessary. It's hard to tell if it will have any
side effects. Your CL should still work without it. Would you mind not touching
this particular file?

[Mathieu, 2017/02/27 18:05:51]

Unh. You're right. This is mysterious to me :)

 
   WebRuntimeFeatures::enablePaymentRequest(
       base::FeatureList::IsEnabled(features::kWebPayments));
-#endif
 
   // Sets the RuntimeEnabledFeatures for Navigation Preload feature only when
   // '--enable-features' command line flag is given. While experimenting this
   // feature using Origin-Trial, this base::Feature is enabled by default in
   // content_features.cc. So FeatureList::IsEnabled() always returns true. But,
   // unless the command line explicitly enabled the feature, this feature should
   // be available only when a valid origin trial token is set. This check is
   // done by the generated code of
   // blink::OriginTrials::serviceWorkerNavigationPreloadEnabled(). See the
   // comments in service_worker_version.h for the details.
@@ skipping 41 matching lines @@
   if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) {
     std::vector<std::string> disabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : disabled_features)
       WebRuntimeFeatures::enableFeatureFromString(feature, false);
   }
 }
 
 }  // namespace content