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

Side by Side Diff: chrome/browser/extensions/extension_context_menu_browsertest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_browsertest.h" 6 #include "chrome/browser/extensions/extension_browsertest.h"
7 #include "chrome/browser/extensions/lazy_background_page_test_util.h" 7 #include "chrome/browser/extensions/lazy_background_page_test_util.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 9 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
10 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h" 10 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 } 545 }
546 546
547 // Tests enabling and disabling a context menu item. 547 // Tests enabling and disabling a context menu item.
548 IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, Enabled) { 548 IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, Enabled) {
549 TestEnabledContextMenu(true); 549 TestEnabledContextMenu(true);
550 TestEnabledContextMenu(false); 550 TestEnabledContextMenu(false);
551 } 551 }
552 552
553 class ExtensionContextMenuBrowserLazyTest : 553 class ExtensionContextMenuBrowserLazyTest :
554 public ExtensionContextMenuBrowserTest { 554 public ExtensionContextMenuBrowserTest {
555 virtual void SetUpOnMainThread() OVERRIDE { 555 virtual void SetUpOnMainThread() override {
556 ExtensionContextMenuBrowserTest::SetUpOnMainThread(); 556 ExtensionContextMenuBrowserTest::SetUpOnMainThread();
557 // Set shorter delays to prevent test timeouts. 557 // Set shorter delays to prevent test timeouts.
558 extensions::ProcessManager::SetEventPageIdleTimeForTesting(1); 558 extensions::ProcessManager::SetEventPageIdleTimeForTesting(1);
559 extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(0); 559 extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(0);
560 } 560 }
561 }; 561 };
562 562
563 IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserLazyTest, EventPage) { 563 IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserLazyTest, EventPage) {
564 GURL about_blank("about:blank"); 564 GURL about_blank("about:blank");
565 LazyBackgroundObserver page_complete; 565 LazyBackgroundObserver page_complete;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 ASSERT_TRUE(LoadContextMenuExtensionIncognito("incognito")); 605 ASSERT_TRUE(LoadContextMenuExtensionIncognito("incognito"));
606 606
607 // Wait for the extension's processes to tell us they've created an item. 607 // Wait for the extension's processes to tell us they've created an item.
608 ASSERT_TRUE(created.WaitUntilSatisfied()); 608 ASSERT_TRUE(created.WaitUntilSatisfied());
609 ASSERT_TRUE(created_incognito.WaitUntilSatisfied()); 609 ASSERT_TRUE(created_incognito.WaitUntilSatisfied());
610 ASSERT_EQ(2u, GetItems().size()); 610 ASSERT_EQ(2u, GetItems().size());
611 611
612 browser()->profile()->DestroyOffTheRecordProfile(); 612 browser()->profile()->DestroyOffTheRecordProfile();
613 ASSERT_EQ(1u, GetItems().size()); 613 ASSERT_EQ(1u, GetItems().size());
614 } 614 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698