Make opening a new tab with the NTP use PAGE_TRANSITION_AUTO_TOPLEVEL.

chrome/browser/ui/browser_browsertest.cc

 // Copyright 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 <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/bind.h"
@@ skipping 55 matching lines @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/app_modal/app_modal_dialog.h"
 #include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/native_app_modal_dialog.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/omnibox/browser/omnibox_view.h"
 #include "components/sessions/core/base_session_service_test_helper.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 2779 matching lines @@
   EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
   EXPECT_EQ(exp_commit_size, wcv_commit_size2);
   gfx::Size exp_final_size(initial_wcv_size);
   exp_final_size.Enlarge(wcv_resize_insets.width(),
                          wcv_resize_insets.height() + height_inset);
   EXPECT_EQ(exp_final_size,
             web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
   EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
 }
 
+// Opening a new tab and then closing it should return focus to the previous
+// tab.
+// Regression test for http://crbug.com/582249
+IN_PROC_BROWSER_TEST_F(BrowserTest, CloseTabFocus) {
+  chrome::NewTab(browser());
+  chrome::NewTab(browser());
+  chrome::NewTab(browser());
+  EXPECT_EQ(3, browser()->tab_strip_model()->active_index());
+
+  browser()->tab_strip_model()->ActivateTabAt(0, true);
+  EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
+
+  chrome::NewTab(browser());
+  EXPECT_EQ(4, browser()->tab_strip_model()->active_index());
+
+  chrome::CloseTab(browser());
+  EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
+
+  // Check opening a new tab via Alt+Enter in the omnibox.
+  browser()->tab_strip_model()->ActivateTabAt(1, true);
+  EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
+
+  browser()->GetOmniboxView()->SetUserText(
+      ASCIIToUTF16("http://www.google.com"));
+  browser()->GetOmniboxView()->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
+  EXPECT_EQ(4, browser()->tab_strip_model()->active_index());
+
+  chrome::CloseTab(browser());
+  EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
+}
+
 IN_PROC_BROWSER_TEST_F(BrowserTest, CanDuplicateTab) {
   GURL url(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(kTitle1File)));
   ui_test_utils::NavigateToURL(browser(), url);
 
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
 
   int active_index = browser()->tab_strip_model()->active_index();
   EXPECT_EQ(0, active_index);
@@ skipping 429 matching lines @@
     Browser* browser = new Browser(params);
     gfx::Rect bounds = browser->window()->GetBounds();
 
     // Should be EXPECT_EQ, but this width is inconsistent across platforms.
     // See https://crbug.com/567925.
     EXPECT_GE(bounds.width(), 100);
     EXPECT_EQ(122, bounds.height());
     browser->window()->Close();
   }
 }