Separate Settings and Help from History and Extensions when settings-in-

chrome/browser/ui/settings_window_manager_browsertest.cc

 // Copyright 2014 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/settings_window_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 165 matching lines @@
   ASSERT_TRUE(settings_browser2);
   // Ensure the observer fired correctly.
   EXPECT_EQ(2u, observer_.new_settings_count());
   EXPECT_EQ(settings_browser2, observer_.browser());
 
   CloseBrowserSynchronously(settings_browser);
   CloseBrowserSynchronously(settings_browser2);
 }
 #endif
 
-IN_PROC_BROWSER_TEST_F(SettingsWindowManagerTest, OpenSettingsChromePages) {
+IN_PROC_BROWSER_TEST_F(SettingsWindowManagerTest, OpenChromePages) {
+  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
+
+  // History should open in the existing browser window.
+  chrome::ShowHistory(browser());
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
   // Settings should open a new browser window.
   chrome::ShowSettings(browser());
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 
-  // History should open a new browser window.
-  CloseNonDefaultBrowsers();
-  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
-  chrome::ShowHistory(browser());
-  EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
-
-  // Extensions should open a new browser window.
+  // Extensions should open in an existing browser window.
   CloseNonDefaultBrowsers();
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   std::string extension_to_highlight;  // none
   chrome::ShowExtensions(browser(), extension_to_highlight);
-  EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
+  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
-  // Downloads should NOT open a new browser window.
-  CloseNonDefaultBrowsers();
-  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
+  // Downloads should open in an existing browser window.
   chrome::ShowDownloads(browser());
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 }