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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_test.cc

Issue 2460063002: Disable failing tests on Mac 10.10 and 10.11 after swarming. (Closed)
Patch Set: fix mac build Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <limits.h> 5 #include <limits.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 1050
1051 chrome::CloseWindow(normal_browser); 1051 chrome::CloseWindow(normal_browser);
1052 chrome::CloseWindow(popup_browser); 1052 chrome::CloseWindow(popup_browser);
1053 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 1053 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
1054 CloseAppWindow(app_window); 1054 CloseAppWindow(app_window);
1055 } 1055 }
1056 #endif // !defined(OS_MACOSX) 1056 #endif // !defined(OS_MACOSX)
1057 1057
1058 IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) { 1058 IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) {
1059 #if defined(OS_MACOSX) 1059 #if defined(OS_MACOSX)
1060 if (base::mac::IsOS10_10())
1061 return; // Fails when swarmed. http://crbug.com/660582
1060 ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen; 1062 ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
1061 #endif 1063 #endif
1062 1064
1063 scoped_refptr<WindowsCreateFunction> function(new WindowsCreateFunction()); 1065 scoped_refptr<WindowsCreateFunction> function(new WindowsCreateFunction());
1064 scoped_refptr<Extension> extension(test_util::CreateEmptyExtension()); 1066 scoped_refptr<Extension> extension(test_util::CreateEmptyExtension());
1065 function->set_extension(extension.get()); 1067 function->set_extension(extension.get());
1066 1068
1067 std::unique_ptr<base::DictionaryValue> result( 1069 std::unique_ptr<base::DictionaryValue> result(
1068 utils::ToDictionary(utils::RunFunctionAndReturnSingleResult( 1070 utils::ToDictionary(utils::RunFunctionAndReturnSingleResult(
1069 function.get(), "[{\"state\": \"minimized\"}]", browser(), 1071 function.get(), "[{\"state\": \"minimized\"}]", browser(),
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2108 EXPECT_TRUE( 2110 EXPECT_TRUE(
2109 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 2111 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
2110 2112
2111 // chrome.tabs.setZoomSettings(). 2113 // chrome.tabs.setZoomSettings().
2112 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab"); 2114 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab");
2113 EXPECT_TRUE( 2115 EXPECT_TRUE(
2114 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 2116 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
2115 } 2117 }
2116 2118
2117 } // namespace extensions 2119 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_window_browsertest.cc ('k') | chrome/browser/ui/cocoa/applescript/window_applescript_test.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698