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

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

Index: chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
index 951fda233651269df8628e931b3e12af1da2d766..685e6bc81114f08da0af275e05e670b959d60f7f 100644
--- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -28,9 +28,10 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/web_applications/web_app_mac.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extension_prefs.h"
@@ -56,7 +57,8 @@ class AppShimInteractiveTest : public extensions::PlatformAppBrowserTest {
 
   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]

Can you carry a base::ScopedFeatureList as a member on this class, and
initialize it in the setup with features::kBookmarkApps? Not sure if there's a
weird restriction here that means you can't use it.

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

Done.

+                                    features::kBookmarkApps.name);
   }
 
  protected: