Re-enable tabs_interactive_uitest for linux_aura

chrome/browser/extensions/api/tabs/tabs_interactive_test.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 <stddef.h>
 
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #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/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "extensions/browser/api_test_utils.h"
 #include "extensions/common/test_util.h"
 
-namespace api_test_utils = extensions::api_test_utils;
-namespace keys = extensions::tabs_constants;
+namespace extensions {
+
+namespace keys = tabs_constants;
 namespace utils = extension_function_test_utils;
 
-typedef InProcessBrowserTest ExtensionTabsTest;
+using ExtensionTabsTest = InProcessBrowserTest;
 
 // http://crbug.com/154081 for Aura specific
 // http://crbug.com/179063 for other general failures on try bots.
 #if defined(OS_WIN)
 #define MAYBE_GetLastFocusedWindow DISABLED_GetLastFocusedWindow
 #else
 #define MAYBE_GetLastFocusedWindow GetLastFocusedWindow
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, MAYBE_GetLastFocusedWindow) {
   // Create a new window which making it the "last focused" window.
   // Note that "last focused" means the "top" most window.
   Browser* new_browser = CreateBrowser(browser()->profile());
+  ui_test_utils::ActivateBrowserWindow(new_browser);
+
+  GURL url("about:blank");
+  AddTabAtIndexToBrowser(new_browser, 0, url, ui::PAGE_TRANSITION_LINK, true);

[Qiang(Joe) Xu, 2016/11/15 02:17:22]

Add these two lines, otherwise test fails on linux.

+
   int focused_window_id =
       extensions::ExtensionTabUtil::GetWindowId(new_browser);
 
   scoped_refptr<extensions::WindowsGetLastFocusedFunction> function =
       new extensions::WindowsGetLastFocusedFunction();
   scoped_refptr<extensions::Extension> extension(
       extensions::test_util::CreateEmptyExtension());
   function->set_extension(extension.get());
   std::unique_ptr<base::DictionaryValue> result(
       utils::ToDictionary(utils::RunFunctionAndReturnSingleResult(
@@ skipping 18 matching lines @@
   // "populate" was enabled so tabs should be populated.
   EXPECT_TRUE(result.get()->GetList(keys::kTabsKey, &tabs));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, 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
-  ui_test_utils::BrowserActivationWaiter waiter(focused_window);
-  waiter.WaitForActivation();
+  ui_test_utils::ActivateBrowserWindow(focused_window);
 
   GURL url("about:blank");
   AddTabAtIndexToBrowser(focused_window, 0, url, ui::PAGE_TRANSITION_LINK,
                          true);
   int focused_window_id =
       extensions::ExtensionTabUtil::GetWindowId(focused_window);
 
   // Get tabs in the 'last focused' window called from non-focused browser.
   scoped_refptr<extensions::TabsQueryFunction> function =
       new extensions::TabsQueryFunction();
@@ skipping 32 matching lines @@
               api_test_utils::GetInteger(result_tab, keys::kWindowIdKey));
   }
 }
 
 #if defined(OS_WIN)  // http://crbug.com/154081 && http://crbug.com/171080
 #define MAYBE_TabCurrentWindow DISABLED_TabCurrentWindow
 #else
 #define MAYBE_TabCurrentWindow TabCurrentWindow
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabCurrentWindow) {
+  ui_test_utils::ActivateBrowserWindow(browser());
   ASSERT_TRUE(RunExtensionTest("tabs/current_window")) << message_;
 }
+
+}  // namespace extensions