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

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

Issue 2799263003: extensions: disable ExtensionTabsTest.FilteredEvents on mac (Closed)
Patch Set: Fix the crbug in the code Created 3 years, 8 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 " \"minWidth\": 200, \"minHeight\": 200," 1235 " \"minWidth\": 200, \"minHeight\": 200,"
1236 " \"maxWidth\": 400, \"maxHeight\": 400}}"); 1236 " \"maxWidth\": 400, \"maxHeight\": 400}}");
1237 1237
1238 listener.Reply("stop"); 1238 listener.Reply("stop");
1239 1239
1240 ASSERT_TRUE(catcher.GetNextResult()); 1240 ASSERT_TRUE(catcher.GetNextResult());
1241 1241
1242 CloseAppWindow(app_window); 1242 CloseAppWindow(app_window);
1243 } 1243 }
1244 1244
1245 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, FilteredEvents) { 1245 // Crashes on Mac/Win only. http://crbug.com/708996
1246 #if defined(OS_MACOSX)
1247 #define MAYBE_FilteredEvents DISABLED_FilteredEvents
1248 #else
1249 #define MAYBE_FilteredEvents FilteredEvents
1250 #endif
1251
1252 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, MAYBE_FilteredEvents) {
1246 extensions::ResultCatcher catcher; 1253 extensions::ResultCatcher catcher;
1247 ExtensionTestMessageListener listener("ready", true); 1254 ExtensionTestMessageListener listener("ready", true);
1248 ASSERT_TRUE( 1255 ASSERT_TRUE(
1249 LoadExtension(test_data_dir_.AppendASCII("api_test/windows/events"))); 1256 LoadExtension(test_data_dir_.AppendASCII("api_test/windows/events")));
1250 ASSERT_TRUE(listener.WaitUntilSatisfied()); 1257 ASSERT_TRUE(listener.WaitUntilSatisfied());
1251 1258
1252 AppWindow* app_window = CreateTestAppWindow( 1259 AppWindow* app_window = CreateTestAppWindow(
1253 "{\"outerBounds\": " 1260 "{\"outerBounds\": "
1254 "{\"width\": 300, \"height\": 300," 1261 "{\"width\": 300, \"height\": 300,"
1255 " \"minWidth\": 200, \"minHeight\": 200," 1262 " \"minWidth\": 200, \"minHeight\": 200,"
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2131 EXPECT_EQ(first_web_contents, 2138 EXPECT_EQ(first_web_contents,
2132 browser()->tab_strip_model()->GetActiveWebContents()); 2139 browser()->tab_strip_model()->GetActiveWebContents());
2133 browser()->tab_strip_model()->ActivateTabAt(1, true); 2140 browser()->tab_strip_model()->ActivateTabAt(1, true);
2134 EXPECT_EQ(second_web_contents, 2141 EXPECT_EQ(second_web_contents,
2135 browser()->tab_strip_model()->GetActiveWebContents()); 2142 browser()->tab_strip_model()->GetActiveWebContents());
2136 2143
2137 EXPECT_EQ(url, second_web_contents->GetVisibleURL()); 2144 EXPECT_EQ(url, second_web_contents->GetVisibleURL());
2138 } 2145 }
2139 2146
2140 } // namespace extensions 2147 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698