Hardcode extensions::util::IsNewBookmarkAppsEnabled() to true, except on Mac.

chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_features.h"
+#include "content/public/common/content_switches.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/extension_test_message_listener.h"
 #import "ui/base/test/scoped_fake_nswindow_focus.h"
 
 namespace {
 
 class AppShimMenuControllerBrowserTest
     : public extensions::PlatformAppBrowserTest {
  protected:
   // The apps that can be installed and launched by SetUpApps().
   enum AvailableApps { PACKAGED_1 = 0x1, PACKAGED_2 = 0x2, HOSTED = 0x4 };
 
   AppShimMenuControllerBrowserTest()
       : app_1_(nullptr),
         app_2_(nullptr),
         hosted_app_(nullptr),
         initial_menu_item_count_(0) {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableNewBookmarkApps);
+    command_line->AppendSwitchASCII(switches::kEnableFeatures,

[dominickn, 2017/03/22 04:18:12]

Ditto base::ScopedFeatureList

[tapted, 2017/03/23 02:59:58]

Done.

+                                    features::kBookmarkApps.name);
   }
 
   // Start testing apps and wait for them to launch. |flags| is a bitmask of
   // AvailableApps.
   void SetUpApps(int flags) {
 
     if (flags & PACKAGED_1) {
       ExtensionTestMessageListener listener_1("Launched", false);
       app_1_ = InstallAndLaunchPlatformApp("minimal_id");
       ASSERT_TRUE(listener_1.WaitUntilSatisfied());
@@ skipping 203 matching lines @@
 
   // OSX will send NSWindowWillResignMainNotification when a main window is
   // closed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSWindowDidResignMainNotification
                     object:app_1_window];
   CheckNoAppMenus();
 }
 
 }  // namespace