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

chrome/browser/ui/extensions/hosted_app_browsertest.cc

 // Copyright 2015 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 <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/common/chrome_features.h"
+#include "content/public/common/content_switches.h"
+#endif
+
 using content::WebContents;
 using extensions::Extension;
 
 namespace {
 
 // Used by ShouldLocationBarForXXX. Performs a navigation and then checks that
 // the location bar visibility is as expcted.
 void NavigateAndCheckForLocationBar(Browser* browser,
                                     const std::string& url_string,
                                     bool expected_visibility) {
   GURL url(url_string);
   ui_test_utils::NavigateToURL(browser, url);
   EXPECT_EQ(expected_visibility,
       browser->hosted_app_controller()->ShouldShowLocationBar());
 }
 
+void EnsureBookmarkAppsEnabled() {
+#if defined(OS_MACOSX)
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kEnableFeatures, features::kBookmarkApps.name);

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

Can you use base::FeatureList::RegisterOverride or a ScopedFeatureList?

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

Done.

+#endif
+}
+
 }  // namespace
 
 class HostedAppTest : public ExtensionBrowserTest {
  public:
   HostedAppTest() : app_browser_(nullptr) {}
   ~HostedAppTest() override {}
 
  protected:
   void SetupApp(const std::string& app_folder, bool is_bookmark_app) {
     const Extension* app = InstallExtensionWithSourceAndFlags(
@@ skipping 23 matching lines @@
     ASSERT_TRUE(app_browser_);
     ASSERT_TRUE(app_browser_ != browser());
   }
 
   Browser* app_browser_;
 };
 
 // Check that the location bar is shown correctly for bookmark apps.
 IN_PROC_BROWSER_TEST_F(HostedAppTest,
                        ShouldShowLocationBarForBookmarkApp) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableNewBookmarkApps);
+  EnsureBookmarkAppsEnabled();
 
   SetupApp("app", true);
 
   // Navigate to the app's launch page; the location bar should be hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.example.com/empty.html", false);
 
   // Navigate to another page on the same origin; the location bar should still
   // hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.example.com/blah", false);
 
   // Navigate to different origin; the location bar should now be visible.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.foo.com/blah", true);
 }
 
 // Check that the location bar is shown correctly for HTTP bookmark apps when
 // they navigate to a HTTPS page on the same origin.
 IN_PROC_BROWSER_TEST_F(HostedAppTest,
                        ShouldShowLocationBarForHTTPBookmarkApp) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableNewBookmarkApps);
+  EnsureBookmarkAppsEnabled();
 
   SetupApp("app", true);
 
   // Navigate to the app's launch page; the location bar should be hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.example.com/empty.html", false);
 
   // Navigate to the https version of the site; the location bar should
   // be hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "https://www.example.com/blah", false);
 }
 
 // Check that the location bar is shown correctly for HTTPS bookmark apps when
 // they navigate to a HTTP page on the same origin.
 IN_PROC_BROWSER_TEST_F(HostedAppTest,
                        ShouldShowLocationBarForHTTPSBookmarkApp) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableNewBookmarkApps);
+  EnsureBookmarkAppsEnabled();
 
   SetupApp("https_app", true);
 
   // Navigate to the app's launch page; the location bar should be hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "https://www.example.com/empty.html", false);
 
   // Navigate to the http version of the site; the location bar should
   // be visible for the https version as it is now on a less secure version
   // of its host.
@@ skipping 32 matching lines @@
 
   // Navigate to the app's launch page with the 'www.' prefis; the location bar
   // should be hidden.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.example.com/empty.html", false);
 
   // Navigate to different origin; the location bar should now be visible.
   NavigateAndCheckForLocationBar(
       app_browser_, "http://www.foo.com/blah", true);
 }