ash: fix regression where ctrl+n put new window on wrong desktop

chrome/browser/ui/extensions/extension_message_bubble_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 "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
 
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 90 matching lines @@
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToExtensionAction() {
   scoped_refptr<const extensions::Extension> action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "action_extension",
           extensions::extension_action_test_util::BROWSER_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(action_extension.get());
 
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
 
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToAppMenu() {
   scoped_refptr<const extensions::Extension> no_action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(no_action_extension.get());
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_APP_MENU, false);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::
     TestBubbleAnchoredToAppMenuWithOtherAction() {
   scoped_refptr<const extensions::Extension> no_action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(no_action_extension.get());
 
   scoped_refptr<const extensions::Extension> action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "action_extension",
           extensions::extension_action_test_util::BROWSER_ACTION,
           extensions::Manifest::INTERNAL);
   extension_service()->AddExtension(action_extension.get());
 
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
 
   CheckBubble(second_browser, ANCHOR_APP_MENU, false);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestUninstallDangerousExtension() {
   // Load an extension that overrides the proxy setting.
   ExtensionTestMessageListener listener("registered", false);
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("api_test")
                         .AppendASCII("proxy")
                         .AppendASCII("register"));
   // Wait for it to complete.
   listener.WaitUntilSatisfied();
 
   // Create a second browser with the extension installed - the bubble will be
   // set to show.
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   // Uninstall the extension before the bubble is shown. This should not crash,
   // and the bubble shouldn't be shown.
   extension_service()->UninstallExtension(
       extension->id(), extensions::UNINSTALL_REASON_FOR_TESTING,
       base::Bind(&base::DoNothing), nullptr);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(second_browser, false, false);
 }
 
 void ExtensionMessageBubbleBrowserTest::PreBubbleShowsOnStartup() {
   LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleShowsOnStartup() {
   base::RunLoop().RunUntilIdle();
   CheckBubble(browser(), ANCHOR_BROWSER_ACTION, true);
   CloseBubble(browser());
 }
 
 void ExtensionMessageBubbleBrowserTest::TestDevModeBubbleIsntShownTwice() {
   scoped_refptr<const extensions::Extension> action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "action_extension",
           extensions::extension_action_test_util::BROWSER_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(action_extension.get());
 
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
 
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   CloseBubble(second_browser);
   base::RunLoop().RunUntilIdle();
 
   // The bubble was already shown, so it shouldn't be shown again.
-  Browser* third_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* third_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(third_browser);
   third_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(third_browser, false, false);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestControlledNewTabPageBubbleShown() {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("override")
                                           .AppendASCII("newtab")));
@@ skipping 67 matching lines @@
 
 void ExtensionMessageBubbleBrowserTest::
     TestControlledStartupNotShownOnRestart() {
   EXPECT_TRUE(StartupBrowserCreator::WasRestarted());
   CheckBubbleIsNotPresent(browser(), false, false);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleWithMultipleWindows() {
   CheckBubbleIsNotPresent(browser(), false, false);
   LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
-  Browser* third_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* third_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(third_browser);
   third_browser->window()->Show();
-  Browser* fourth_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* fourth_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(fourth_browser);
   fourth_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   // Even though the bubble isn't present on these browser windows, highlighting
   // is per-profile.
   CheckBubbleIsNotPresent(browser(), true, true);
   CheckBubbleIsNotPresent(third_browser, true, true);
   CheckBubbleIsNotPresent(fourth_browser, true, true);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestClickingLearnMoreButton() {
   CheckBubbleIsNotPresent(browser(), false, false);
   LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   ClickLearnMoreButton(second_browser);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(second_browser, false, false);
   // The learn more link goes to the chrome://extensions page, so it should be
   // opened in the active tab.
   content::WebContents* active_web_contents =
       second_browser->tab_strip_model()->GetActiveWebContents();
   content::WaitForLoadStop(active_web_contents);
   EXPECT_EQ(GURL(chrome::kChromeUIExtensionsURL),
             active_web_contents->GetLastCommittedURL());
 }
 
 void ExtensionMessageBubbleBrowserTest::TestClickingActionButton() {
   CheckBubbleIsNotPresent(browser(), false, false);
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile());
   std::string id = extension->id();
   EXPECT_TRUE(registry->enabled_extensions().GetByID(id));
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   ClickActionButton(second_browser);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(browser(), false, false);
   // Clicking the action button disabled the extension.
   EXPECT_FALSE(registry->enabled_extensions().GetByID(id));
 }
 
 void ExtensionMessageBubbleBrowserTest::TestClickingDismissButton() {
   CheckBubbleIsNotPresent(browser(), false, false);
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile());
   std::string id = extension->id();
   EXPECT_TRUE(registry->enabled_extensions().GetByID(id));
-  Browser* second_browser = new Browser(Browser::CreateParams(profile()));
+  Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   ClickDismissButton(second_browser);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(browser(), false, false);
   // Clicking dismiss should have no affect, so the extension should still be
   // active.
   EXPECT_TRUE(registry->enabled_extensions().GetByID(id));
 }