Disable bookmark apps on non-ChromeOS platforms.

chrome/browser/extensions/api/management/management_apitest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/test/test_utils.h"
@@ skipping 283 matching lines @@
   extensions::SetLaunchType(browser()->profile(), app_id,
                             extensions::LAUNCH_TYPE_WINDOW);
 
   std::string app_id_new;
   LoadAndWaitForLaunch("management/launch_app_tab", &app_id_new);
   ASSERT_FALSE(HasFatalFailure());
 
   // If the ID changed, then the pref will not apply to the app.
   ASSERT_EQ(app_id, app_id_new);
 
+  unsigned expected_browser_count = 2;
+#if defined(OS_MACOSX)
+  // Without the new Bookmark Apps, Mac has no way of making standalone browser
+  // windows for apps, so it will add to the tabstrip instead.
+  EXPECT_FALSE(extensions::util::IsNewBookmarkAppsEnabled());
+  expected_browser_count = 1;
+  ASSERT_EQ(2, browser()->tab_strip_model()->count());
+#endif
   // Find the app's browser.  Opening in a new window will create
   // a new browser.
-  ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
-  Browser* app_browser = FindOtherBrowser(browser());
-  ASSERT_TRUE(app_browser->is_app());
+  ASSERT_EQ(expected_browser_count,
+            chrome::GetBrowserCount(browser()->profile(),
+                                    browser()->host_desktop_type()));
+  if (expected_browser_count == 2) {
+    Browser* app_browser = FindOtherBrowser(browser());
+    ASSERT_TRUE(app_browser->is_app());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) {
   LoadExtensions();
   base::FilePath basedir = test_data_dir_.AppendASCII("management");
   LoadNamedExtension(basedir, "packaged_app");
 
   ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html"));
 }