Index: chrome/browser/extensions/api/tabs/tabs_test.cc |
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc |
index 6203ae4da2d53f3100ee4cfc18960abf75c10ca7..e45f3074b1ca6694966b0d772b35e508b8a5aa69 100644 |
--- a/chrome/browser/extensions/api/tabs/tabs_test.cc |
+++ b/chrome/browser/extensions/api/tabs/tabs_test.cc |
@@ -580,29 +580,32 @@ IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) { |
scoped_ptr<base::DictionaryValue> result( |
utils::ToDictionary(utils::RunFunctionAndReturnSingleResult( |
- function.get(), "[{\"state\": \"fullscreen\"}]", browser(), |
+ function.get(), "[{\"state\": \"minimized\"}]", browser(), |
utils::INCLUDE_INCOGNITO))); |
int window_id = api_test_utils::GetInteger(result.get(), "id"); |
std::string error; |
Browser* new_window = ExtensionTabUtil::GetBrowserFromWindowID( |
function.get(), window_id, &error); |
- EXPECT_TRUE(new_window->window()->IsFullscreen()); |
EXPECT_TRUE(error.empty()); |
+#if !defined(OS_LINUX) || defined(OS_CHROMEOS) |
+ // DesktopWindowTreeHostX11::IsMinimized() relies on an asynchronous update |
+ // from the window server. |
+ EXPECT_TRUE(new_window->window()->IsMinimized()); |
+#endif |
+// TODO(limasdf): Flaky on mac. See http://crbug.com/482433. |
+#if !defined(OS_MACOSX) |
function = new WindowsCreateFunction(); |
function->set_extension(extension.get()); |
result.reset(utils::ToDictionary(utils::RunFunctionAndReturnSingleResult( |
- function.get(), "[{\"state\": \"minimized\"}]", browser(), |
+ function.get(), "[{\"state\": \"fullscreen\"}]", browser(), |
utils::INCLUDE_INCOGNITO))); |
window_id = api_test_utils::GetInteger(result.get(), "id"); |
new_window = ExtensionTabUtil::GetBrowserFromWindowID(function.get(), |
window_id, &error); |
EXPECT_TRUE(error.empty()); |
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) |
- // DesktopWindowTreeHostX11::IsMinimized() relies on an asynchronous update |
- // from the window server. |
- EXPECT_TRUE(new_window->window()->IsMinimized()); |
-#endif |
+ EXPECT_TRUE(new_window->window()->IsFullscreen()); |
+#endif // !defined(OS_MACOSX) |
} |
IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, ValidateCreateWindowState) { |