Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1369)

Unified Diff: chrome/browser/extensions/api/tabs/tabs_interactive_test.cc

Issue 11414223: Move the test functions that deal with focus to interactive_ui_tets_utils.h and into the interactiv… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/tabs/tabs_interactive_test.cc
===================================================================
--- chrome/browser/extensions/api/tabs/tabs_interactive_test.cc (revision 170118)
+++ chrome/browser/extensions/api/tabs/tabs_interactive_test.cc (working copy)
@@ -9,6 +9,8 @@
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -51,3 +53,59 @@
// "populate" was enabled so tabs should be populated.
EXPECT_TRUE(result.get()->GetList(keys::kTabsKey, &tabs));
}
+
+// Flaky: http://crbug.com/136562
+IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DISABLED_QueryLastFocusedWindowTabs) {
+ const size_t kExtraWindows = 2;
+ for (size_t i = 0; i < kExtraWindows; ++i)
+ CreateBrowser(browser()->profile());
+
+ Browser* focused_window = CreateBrowser(browser()->profile());
+#if defined(OS_MACOSX)
+ // See BrowserWindowCocoa::Show. In tests, Browser::window()->IsActive won't
+ // work unless we fake the browser being launched by the user.
+ ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+ focused_window->window()->GetNativeWindow()));
+#endif
+
+ // Needed on Mac and Linux so that the BrowserWindow::IsActive calls work.
+ content::RunAllPendingInMessageLoop();
+
+ GURL url;
+ AddTabAtIndexToBrowser(focused_window, 0, url, content::PAGE_TRANSITION_LINK);
+ int focused_window_id = ExtensionTabUtil::GetWindowId(focused_window);
+
+ // Get tabs in the 'last focused' window called from non-focused browser.
+ scoped_refptr<QueryTabsFunction> function = new QueryTabsFunction();
+ scoped_ptr<base::ListValue> result(utils::ToList(
+ utils::RunFunctionAndReturnSingleResult(function.get(),
+ "[{\"lastFocusedWindow\":true}]",
+ browser())));
+
+ ListValue* result_tabs = result.get();
+ // We should have one initial tab and one added tab.
+ EXPECT_EQ(2u, result_tabs->GetSize());
+ for (size_t i = 0; i < result_tabs->GetSize(); ++i) {
+ DictionaryValue* result_tab = NULL;
+ EXPECT_TRUE(result_tabs->GetDictionary(i, &result_tab));
+ EXPECT_EQ(focused_window_id, utils::GetInteger(result_tab,
+ keys::kWindowIdKey));
+ }
+
+ // Get tabs NOT in the 'last focused' window called from the focused browser.
+ function = new QueryTabsFunction();
+ result.reset(utils::ToList(
+ utils::RunFunctionAndReturnSingleResult(function.get(),
+ "[{\"lastFocusedWindow\":false}]",
+ browser())));
+
+ result_tabs = result.get();
+ // We should get one tab for each extra window and one for the initial window.
+ EXPECT_EQ(kExtraWindows + 1, result_tabs->GetSize());
+ for (size_t i = 0; i < result_tabs->GetSize(); ++i) {
+ DictionaryValue* result_tab = NULL;
+ EXPECT_TRUE(result_tabs->GetDictionary(i, &result_tab));
+ EXPECT_NE(focused_window_id, utils::GetInteger(result_tab,
+ keys::kWindowIdKey));
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698