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

Side by Side Diff: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

Issue 1111073003: [Extensions] Temporarily disable a ToolbarActionsBar test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h" 5 #include "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
9 #include "chrome/browser/extensions/browser_action_test_util.h" 9 #include "chrome/browser/extensions/browser_action_test_util.h"
10 #include "chrome/browser/extensions/extension_action.h" 10 #include "chrome/browser/extensions/extension_action.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 } 405 }
406 406
407 // Waiting for popup termination is flaky on mac; disabling while investigating. 407 // Waiting for popup termination is flaky on mac; disabling while investigating.
408 #if defined(OS_MACOSX) 408 #if defined(OS_MACOSX)
409 #define MAYBE_OverflowedBrowserActionPopupTest DISABLED_OverflowedBrowserActionP opupTest 409 #define MAYBE_OverflowedBrowserActionPopupTest DISABLED_OverflowedBrowserActionP opupTest
410 #else 410 #else
411 #define MAYBE_OverflowedBrowserActionPopupTest OverflowedBrowserActionPopupTest 411 #define MAYBE_OverflowedBrowserActionPopupTest OverflowedBrowserActionPopupTest
412 #endif 412 #endif
413 IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest, 413 IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
414 OverflowedBrowserActionPopupTest) { 414 MAYBE_OverflowedBrowserActionPopupTest) {
415 scoped_ptr<BrowserActionTestUtil> overflow_bar = 415 scoped_ptr<BrowserActionTestUtil> overflow_bar =
416 browser_actions_bar()->CreateOverflowBar(); 416 browser_actions_bar()->CreateOverflowBar();
417 417
418 // Load up two extensions that have browser action popups. 418 // Load up two extensions that have browser action popups.
419 base::FilePath data_dir = 419 base::FilePath data_dir =
420 test_data_dir_.AppendASCII("api_test").AppendASCII("browser_action"); 420 test_data_dir_.AppendASCII("api_test").AppendASCII("browser_action");
421 const extensions::Extension* first_extension = 421 const extensions::Extension* first_extension =
422 LoadExtension(data_dir.AppendASCII("open_popup")); 422 LoadExtension(data_dir.AppendASCII("open_popup"));
423 ASSERT_TRUE(first_extension); 423 ASSERT_TRUE(first_extension);
424 const extensions::Extension* second_extension = 424 const extensions::Extension* second_extension =
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 EXPECT_FALSE(second_controller_main->is_showing_popup()); 487 EXPECT_FALSE(second_controller_main->is_showing_popup());
488 EXPECT_FALSE(second_controller_overflow->is_showing_popup()); 488 EXPECT_FALSE(second_controller_overflow->is_showing_popup());
489 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); 489 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
490 EXPECT_EQ(2, overflow_bar->VisibleBrowserActions()); 490 EXPECT_EQ(2, overflow_bar->VisibleBrowserActions());
491 base::RunLoop().RunUntilIdle(); 491 base::RunLoop().RunUntilIdle();
492 EXPECT_EQ(first_controller_main->GetId(), 492 EXPECT_EQ(first_controller_main->GetId(),
493 browser_actions_bar()->GetExtensionId(0)); 493 browser_actions_bar()->GetExtensionId(0));
494 EXPECT_EQ(second_controller_main->GetId(), 494 EXPECT_EQ(second_controller_main->GetId(),
495 browser_actions_bar()->GetExtensionId(1)); 495 browser_actions_bar()->GetExtensionId(1));
496 } 496 }
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