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

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

Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 8035dfcd4182973d0ab0728442d8aa171796c2dd..bea882f55cee96c5ff60a302782d63a258d30286 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -20,7 +20,8 @@
 #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"
@@ -44,7 +45,8 @@ class AppShimMenuControllerBrowserTest
 
   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