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

Side by Side Diff: chrome/browser/extensions/api/system_indicator/system_indicator_apitest.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 "chrome/browser/extensions/api/system_indicator/system_indicator_manage r.h" 5 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage r.h"
6 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage r_factory.h" 6 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage r_factory.h"
7 #include "chrome/browser/extensions/extension_action.h" 7 #include "chrome/browser/extensions/extension_action.h"
8 #include "chrome/browser/extensions/extension_action_manager.h" 8 #include "chrome/browser/extensions/extension_action_manager.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/extensions/lazy_background_page_test_util.h" 10 #include "chrome/browser/extensions/lazy_background_page_test_util.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "extensions/browser/extension_system.h" 12 #include "extensions/browser/extension_system.h"
13 #include "extensions/browser/process_manager.h" 13 #include "extensions/browser/process_manager.h"
14 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
15 #include "extensions/test/result_catcher.h" 15 #include "extensions/test/result_catcher.h"
16 16
17 class SystemIndicatorApiTest : public ExtensionApiTest { 17 class SystemIndicatorApiTest : public ExtensionApiTest {
18 public: 18 public:
19 virtual void SetUpOnMainThread() OVERRIDE { 19 virtual void SetUpOnMainThread() override {
20 ExtensionApiTest::SetUpOnMainThread(); 20 ExtensionApiTest::SetUpOnMainThread();
21 // Set shorter delays to prevent test timeouts in tests that need to wait 21 // Set shorter delays to prevent test timeouts in tests that need to wait
22 // for the event page to unload. 22 // for the event page to unload.
23 extensions::ProcessManager::SetEventPageIdleTimeForTesting(1); 23 extensions::ProcessManager::SetEventPageIdleTimeForTesting(1);
24 extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(1); 24 extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(1);
25 } 25 }
26 26
27 const extensions::Extension* LoadExtensionAndWait( 27 const extensions::Extension* LoadExtensionAndWait(
28 const std::string& test_name) { 28 const std::string& test_name) {
29 LazyBackgroundObserver page_complete; 29 LazyBackgroundObserver page_complete;
(...skipping 29 matching lines...) Expand all
59 59
60 // Lazy Background Page has been shut down. 60 // Lazy Background Page has been shut down.
61 extensions::ProcessManager* pm = 61 extensions::ProcessManager* pm =
62 extensions::ExtensionSystem::Get(profile())->process_manager(); 62 extensions::ExtensionSystem::Get(profile())->process_manager();
63 EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id())); 63 EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id()));
64 64
65 EXPECT_TRUE(manager->SendClickEventToExtensionForTest(extension->id())); 65 EXPECT_TRUE(manager->SendClickEventToExtensionForTest(extension->id()));
66 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 66 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
67 } 67 }
68 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698