Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
[email protected]
Review URL: https://codereview.chromium.org/671973003
Cr-Commit-Position: refs/heads/master@{#301704}
diff --git a/chrome/browser/extensions/active_script_controller_unittest.cc b/chrome/browser/extensions/active_script_controller_unittest.cc
index ed6ed81c..3e416cd 100644
--- a/chrome/browser/extensions/active_script_controller_unittest.cc
+++ b/chrome/browser/extensions/active_script_controller_unittest.cc
@@ -41,7 +41,7 @@
class ActiveScriptControllerUnitTest : public ChromeRenderViewHostTestHarness {
protected:
ActiveScriptControllerUnitTest();
- virtual ~ActiveScriptControllerUnitTest();
+ ~ActiveScriptControllerUnitTest() override;
// Creates an extension with all hosts permission and adds it to the registry.
const Extension* AddExtension();
@@ -71,7 +71,7 @@
// Increment the number of executions for the given |extension_id|.
void IncrementExecutionCount(const std::string& extension_id);
- virtual void SetUp() override;
+ void SetUp() override;
// Since ActiveScriptController's behavior is behind a flag, override the
// feature switch.
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index e847eff7..d86665a 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -77,7 +77,7 @@
true,
true)) {}
- virtual void SetUp() override {
+ void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
TabHelper::CreateForWebContents(web_contents());
}
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
index dab330a..4bef42b54 100644
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -107,7 +107,7 @@
class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
#if defined OS_CHROMEOS
test_user_manager_.reset(new chromeos::ScopedTestUserManager());
@@ -117,7 +117,7 @@
switches::kEnableExtensionActivityLogTesting);
}
- virtual void TearDown() override {
+ void TearDown() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
index e701079..df24455 100644
--- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
@@ -28,14 +28,14 @@
class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
#if defined OS_CHROMEOS
test_user_manager_.reset(new chromeos::ScopedTestUserManager());
#endif
}
- virtual void TearDown() override {
+ void TearDown() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 57b803d..72af356 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -56,7 +56,7 @@
class ActivityLogTest : public ChromeRenderViewHostTestHarness {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
#if defined OS_CHROMEOS
test_user_manager_.reset(new chromeos::ScopedTestUserManager());
@@ -72,7 +72,7 @@
base::RunLoop().RunUntilIdle();
}
- virtual void TearDown() override {
+ void TearDown() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc
index ab7b258..a287020 100644
--- a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc
+++ b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc
@@ -171,7 +171,7 @@
class AdInjectionBrowserTest : public ExtensionBrowserTest {
protected:
AdInjectionBrowserTest();
- virtual ~AdInjectionBrowserTest();
+ ~AdInjectionBrowserTest() override;
void SetUpOnMainThread() override;
void TearDownOnMainThread() override;
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index 7ec05cf7..847260c 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -52,7 +52,7 @@
(&command_line, base::FilePath(), false);
}
- virtual ~CountingPolicyTest() {
+ ~CountingPolicyTest() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc
index 961de8c..90433b9 100644
--- a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc
+++ b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc
@@ -14,16 +14,14 @@
class DatabaseStringTableTest : public testing::Test {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath db_file = temp_dir_.path().AppendASCII("StringTable.db");
ASSERT_TRUE(db_.Open(db_file));
}
- virtual void TearDown() override {
- db_.Close();
- }
+ void TearDown() override { db_.Close(); }
base::ScopedTempDir temp_dir_;
sql::Connection db_;
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index 75f06b6..56115aa 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -53,7 +53,7 @@
(&command_line, base::FilePath(), false);
}
- virtual ~FullStreamUIPolicyTest() {
+ ~FullStreamUIPolicyTest() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
index 9dae73c..7f29413 100644
--- a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
@@ -30,7 +30,7 @@
class HashedAdNetworkDatabaseUnitTest : public testing::Test {
protected:
- virtual void SetUp() override;
+ void SetUp() override;
AdNetworkDatabase* database() { return database_.get(); }
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
index 7196ddb..5b05b62 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -23,7 +23,7 @@
public:
ActivityLogApiTest() : saved_cmdline_(CommandLine::NO_PROGRAM) {}
- virtual ~ActivityLogApiTest() {
+ ~ActivityLogApiTest() override {
ExtensionApiTest::SetUpCommandLine(&saved_cmdline_);
*CommandLine::ForCurrentProcess() = saved_cmdline_;
}
diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
index dd0603e..509fde23 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
@@ -50,7 +50,7 @@
public:
using ExtensionApiUnittest::RunFunction;
- virtual void SetUp() {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
test_clock_ = new base::SimpleTestClock();
diff --git a/chrome/browser/extensions/api/audio/audio_apitest.cc b/chrome/browser/extensions/api/audio/audio_apitest.cc
index 4b72507..6ec2fa6 100644
--- a/chrome/browser/extensions/api/audio/audio_apitest.cc
+++ b/chrome/browser/extensions/api/audio/audio_apitest.cc
@@ -14,7 +14,7 @@
class AudioApiTest: public ExtensionApiTest {
public:
AudioApiTest() {}
- virtual ~AudioApiTest() {}
+ ~AudioApiTest() override {}
};
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/extensions/api/audio/audio_service_linux.cc b/chrome/browser/extensions/api/audio/audio_service_linux.cc
index 625ecec..45d76c7 100644
--- a/chrome/browser/extensions/api/audio/audio_service_linux.cc
+++ b/chrome/browser/extensions/api/audio/audio_service_linux.cc
@@ -21,20 +21,20 @@
class AudioServiceImpl : public AudioService {
public:
AudioServiceImpl();
- virtual ~AudioServiceImpl();
+ ~AudioServiceImpl() override;
private:
// Called by listeners to this service to add/remove themselves as observers.
- virtual void AddObserver(AudioService::Observer* observer) override;
- virtual void RemoveObserver(AudioService::Observer* observer) override;
+ void AddObserver(AudioService::Observer* observer) override;
+ void RemoveObserver(AudioService::Observer* observer) override;
// Start to query audio device information.
- virtual void StartGetInfo(const GetInfoCallback& callback) override;
- virtual void SetActiveDevices(const DeviceIdList& device_list) override;
- virtual bool SetDeviceProperties(const std::string& device_id,
- bool muted,
- int volume,
- int gain) override;
+ void StartGetInfo(const GetInfoCallback& callback) override;
+ void SetActiveDevices(const DeviceIdList& device_list) override;
+ bool SetDeviceProperties(const std::string& device_id,
+ bool muted,
+ int volume,
+ int gain) override;
// List of observers.
ObserverList<AudioService::Observer> observer_list_;
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
index 2982099..6a57f26d 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
@@ -31,7 +31,7 @@
ExtensionBookmarksTest()
: client_(NULL), model_(NULL), node_(NULL), node2_(NULL), folder_(NULL) {}
- virtual void SetUp() override {
+ void SetUp() override {
profile_.CreateBookmarkModel(false);
model_ = BookmarkModelFactory::GetForProfile(&profile_);
client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
index 799e658..69c35d4 100644
--- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
+++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
@@ -316,7 +316,7 @@
} // namespace
class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest {
- virtual void SetUp() override {
+ void SetUp() override {
EnablePixelOutput();
CastStreamingApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc
index f15d7e81..2615d3f 100644
--- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc
+++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc
@@ -355,7 +355,7 @@
return endpoint;
}
- virtual void SetUp() override {
+ void SetUp() override {
EnablePixelOutput();
ExtensionApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
index 2287361..ef1fe6c20 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
@@ -91,9 +91,9 @@
class CopresenceApiUnittest : public ExtensionApiUnittest {
public:
CopresenceApiUnittest() {}
- virtual ~CopresenceApiUnittest() {}
+ ~CopresenceApiUnittest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
CopresenceService* service =
diff --git a/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_apitest.cc
index 77e646f..64dbc12 100644
--- a/chrome/browser/extensions/api/debugger/debugger_apitest.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_apitest.cc
@@ -27,7 +27,7 @@
class DebuggerApiTest : public ExtensionApiTest {
protected:
- virtual ~DebuggerApiTest() {}
+ ~DebuggerApiTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpOnMainThread() override;
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
index b2ff97edb..d35dab4a 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
@@ -41,9 +41,9 @@
: ui_(content::BrowserThread::UI, &message_loop_),
io_(content::BrowserThread::IO, &message_loop_) {}
- virtual ~RulesRegistryServiceTest() {}
+ ~RulesRegistryServiceTest() override {}
- virtual void TearDown() override {
+ void TearDown() override {
// Make sure that deletion traits of all registries are executed.
message_loop_.RunUntilIdle();
}
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
index e2864c0..d557eb3 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
@@ -45,7 +45,7 @@
&cache_delegate_,
RulesRegistry::WebViewKey(0, 0))) {}
- virtual void SetUp() {
+ void SetUp() override {
env_.GetExtensionPrefs(); // Force creation before adding extensions.
// Note that env_.MakeExtension below also forces the creation of
// ExtensionService.
@@ -65,7 +65,7 @@
CHECK_NE(extension2_->id(), extension1_->id());
}
- virtual ~RulesRegistryWithCacheTest() {}
+ ~RulesRegistryWithCacheTest() override {}
std::string AddRule(const std::string& extension_id,
const std::string& rule_id,
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
index 31e7b707..4c72706 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
@@ -61,7 +61,7 @@
// to trunk.
: current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
}
- virtual ~DeclarativeContentApiTest() {}
+ ~DeclarativeContentApiTest() override {}
extensions::ScopedCurrentChannel current_channel_;
TestExtensionDir ext_dir_;
diff --git a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
index 251ddced..8d881e64 100644
--- a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
@@ -92,7 +92,7 @@
class RequestContentScriptAPITest : public ExtensionBrowserTest {
public:
RequestContentScriptAPITest();
- virtual ~RequestContentScriptAPITest() {}
+ ~RequestContentScriptAPITest() override {}
// Performs script injection test on a common local URL using the given
// |manifest_permission| and |script_matcher|. Does not return until
diff --git a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc
index 525c386..070006ea 100644
--- a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc
@@ -37,7 +37,7 @@
// to trunk.
: current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
}
- virtual ~SetIconAPITest() {}
+ ~SetIconAPITest() override {}
extensions::ScopedCurrentChannel current_channel_;
TestExtensionDir ext_dir_;
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index 3c1e3d4..004ff2164 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -76,7 +76,7 @@
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
protected:
- virtual void SetUp() override;
+ void SetUp() override;
// Creates a URL request for URL |url_string|, and applies the actions from
// |action_set| as if they were triggered by the extension with
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index 391ffa30..36614b49 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -84,11 +84,11 @@
: ui_(content::BrowserThread::UI, &message_loop_),
io_(content::BrowserThread::IO, &message_loop_) {}
- virtual ~WebRequestRulesRegistryTest() {}
+ ~WebRequestRulesRegistryTest() override {}
- virtual void SetUp() override;
+ void SetUp() override;
- virtual void TearDown() override {
+ void TearDown() override {
// Make sure that deletion traits of all registries are executed.
message_loop_.RunUntilIdle();
}
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
index f071377..1cd44c3e 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -124,7 +124,7 @@
DesktopCaptureChooseDesktopMediaFunction::
SetPickerFactoryForTests(&picker_factory_);
}
- virtual ~DesktopCaptureApiTest() {
+ ~DesktopCaptureApiTest() override {
DesktopCaptureChooseDesktopMediaFunction::
SetPickerFactoryForTests(NULL);
}
diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
index 89f7fac..bf8904c6f 100644
--- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
+++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
@@ -58,7 +58,7 @@
class DevicePermissionsManagerTest : public testing::Test {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
testing::Test::SetUp();
env_.GetExtensionPrefs(); // Force creation before adding extensions.
extension_ = env_.MakeExtension(*base::test::ParseJson(
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index 531b5cd4..cc008fe 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -4067,7 +4067,8 @@
class DownloadsApiTest : public ExtensionApiTest {
public:
DownloadsApiTest() {}
- virtual ~DownloadsApiTest() {}
+ ~DownloadsApiTest() override {}
+
private:
DISALLOW_COPY_AND_ASSIGN(DownloadsApiTest);
};
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 3b034cc..96a564e 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -70,7 +70,7 @@
class BrowserActionApiTest : public ExtensionApiTest {
public:
BrowserActionApiTest() {}
- virtual ~BrowserActionApiTest() {}
+ ~BrowserActionApiTest() override {}
protected:
BrowserActionTestUtil GetBrowserActionsBar() {
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 9c18248..eafd730 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -39,7 +39,7 @@
class BrowserActionInteractiveTest : public ExtensionApiTest {
public:
BrowserActionInteractiveTest() {}
- virtual ~BrowserActionInteractiveTest() {}
+ ~BrowserActionInteractiveTest() override {}
protected:
// Function to control whether to run popup tests for the current platform.
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
index 425225e..c564e32 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
@@ -31,7 +31,7 @@
class FeedbackTest : public ExtensionBrowserTest {
public:
- virtual void SetUp() override {
+ void SetUp() override {
extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
InProcessBrowserTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
index ba5b01d..f6089814d 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
@@ -11,7 +11,7 @@
class FeedbackApiTest: public ExtensionApiTest {
public:
FeedbackApiTest() {}
- virtual ~FeedbackApiTest() {}
+ ~FeedbackApiTest() override {}
};
// Fails on Linux/Win. http://crbug.com/408917
diff --git a/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc b/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc
index f9c7c37..bc34cc2 100644
--- a/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc
+++ b/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc
@@ -50,9 +50,9 @@
class FileHandlersMimeUtilTest : public testing::Test {
protected:
FileHandlersMimeUtilTest() {}
- virtual ~FileHandlersMimeUtilTest() {}
+ ~FileHandlersMimeUtilTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
file_system_context_ =
content::CreateFileSystemContextForTesting(NULL, data_dir_.path());
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
index 4b1861d..9b60f91 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -74,7 +74,7 @@
void SetUpOnMainThread() override { ClearCommandLineArgs(); }
- virtual void TearDown() override {
+ void TearDown() override {
FileSystemChooseEntryFunction::StopSkippingPickerForTest();
PlatformAppBrowserTest::TearDown();
};
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
index 020c655..064f8c7 100644
--- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
+++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
@@ -83,7 +83,7 @@
class HotwordPrivateApiTest : public ExtensionApiTest {
public:
HotwordPrivateApiTest() {}
- virtual ~HotwordPrivateApiTest() {}
+ ~HotwordPrivateApiTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index 86d34e2..6d18d6b 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -678,7 +678,7 @@
FakeSigninManagerForTesting* signin_manager_;
FakeProfileOAuth2TokenService* token_service_;
- virtual ~GetAuthTokenFunctionTest() {}
+ ~GetAuthTokenFunctionTest() override {}
// Helper to create an extension with specific OAuth2Info fields set.
// |fields_to_set| should be computed by using fields of Oauth2Fields enum.
diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
index d21b7d9..c3ced42 100644
--- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc
+++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
@@ -125,7 +125,7 @@
class IdleTest : public ExtensionApiUnittest {
public:
- virtual void SetUp() override;
+ void SetUp() override;
protected:
IdleManager* idle_manager_;
diff --git a/chrome/browser/extensions/api/idltest/idltest_apitest.cc b/chrome/browser/extensions/api/idltest/idltest_apitest.cc
index 95a608e..57eae4a 100644
--- a/chrome/browser/extensions/api/idltest/idltest_apitest.cc
+++ b/chrome/browser/extensions/api/idltest/idltest_apitest.cc
@@ -10,7 +10,7 @@
public:
// Set the channel to "trunk" since idltest is restricted to trunk.
ExtensionIdltestApiTest() : trunk_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
- virtual ~ExtensionIdltestApiTest() {}
+ ~ExtensionIdltestApiTest() override {}
private:
extensions::ScopedCurrentChannel trunk_;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
index dbb0aa5..1dbe937 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
@@ -74,7 +74,7 @@
start_success_(false) {
}
- virtual void SetUp() override {
+ void SetUp() override {
ImageWriterUnitTestBase::SetUp();
extension_system_ = static_cast<FakeExtensionSystem*>(
ExtensionSystemFactory::GetInstance()->
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
index 4ec4290..e038d30 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
@@ -67,7 +67,7 @@
protected:
ImageWriterOperationTest()
: profile_(new TestingProfile), manager_(profile_.get()) {}
- virtual void SetUp() override {
+ void SetUp() override {
ImageWriterUnitTestBase::SetUp();
// Create the zip file.
@@ -88,7 +88,7 @@
operation_->SetImagePath(test_utils_.GetImagePath());
}
- virtual void TearDown() override {
+ void TearDown() override {
// Ensure all callbacks have been destroyed and cleanup occurs.
operation_->Cancel();
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.h b/chrome/browser/extensions/api/image_writer_private/test_utils.h
index bca303c..65fd306e 100644
--- a/chrome/browser/extensions/api/image_writer_private/test_utils.h
+++ b/chrome/browser/extensions/api/image_writer_private/test_utils.h
@@ -167,10 +167,10 @@
class ImageWriterUnitTestBase : public testing::Test {
protected:
ImageWriterUnitTestBase();
- virtual ~ImageWriterUnitTestBase();
+ ~ImageWriterUnitTestBase() override;
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
ImageWriterTestUtils test_utils_;
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc
index 67a6da22..7c73660 100644
--- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc
@@ -73,7 +73,7 @@
protected:
ImageWriterWriteFromUrlOperationTest() : manager_(&test_profile_) {}
- virtual void SetUp() override {
+ void SetUp() override {
ImageWriterUnitTestBase::SetUp();
// Turn on interception and set up our dummy file.
@@ -86,7 +86,7 @@
test_utils_.GetImagePath());
}
- virtual void TearDown() override {
+ void TearDown() override {
ImageWriterUnitTestBase::TearDown();
// Remember to turn off global interception.
diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc
index ba49ca9..de44197 100644
--- a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc
+++ b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc
@@ -65,9 +65,9 @@
class DnsSdRegistryTest : public testing::Test {
public:
DnsSdRegistryTest() {}
- virtual ~DnsSdRegistryTest() {}
+ ~DnsSdRegistryTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
registry_.reset(new TestDnsSdRegistry());
registry_->AddObserver(&observer_);
}
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index 326c8384..e338991c 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -112,7 +112,7 @@
class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
protected:
MediaGalleriesPlatformAppBrowserTest() : test_jpg_size_(0) {}
- virtual ~MediaGalleriesPlatformAppBrowserTest() {}
+ ~MediaGalleriesPlatformAppBrowserTest() override {}
void SetUpOnMainThread() override {
PlatformAppBrowserTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
index 1d947fe..5e1208e 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
@@ -78,7 +78,7 @@
public:
MediaGalleriesGalleryWatchApiTest()
: extension_(NULL), background_host_(NULL) {}
- virtual ~MediaGalleriesGalleryWatchApiTest() {}
+ ~MediaGalleriesGalleryWatchApiTest() override {}
protected:
// ExtensionApiTest overrides.
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
index 6eb25361..3b14aa3 100644
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
@@ -74,7 +74,7 @@
: extension_(NULL),
background_host_(NULL) {
}
- virtual ~MediaGalleriesPrivateGalleryWatchApiTest() {}
+ ~MediaGalleriesPrivateGalleryWatchApiTest() override {}
protected:
// ExtensionApiTest overrides.
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
index 39ab93e..68e5c92 100644
--- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
+++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
@@ -100,11 +100,9 @@
thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
channel_closed_(false) {}
- virtual void SetUp() override {
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- }
+ void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
- virtual void TearDown() override {
+ void TearDown() override {
if (native_message_host_.get()) {
BrowserThread::DeleteSoon(
BrowserThread::IO, FROM_HERE, native_message_host_.release());
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc
index 0cdf3ef..41551fa 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc
@@ -25,7 +25,7 @@
class NativeMessagingHostManifestTest : public ::testing::Test {
public:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
manifest_path_ = temp_dir_.path().AppendASCII("test.json");
}
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_factory_linux.h b/chrome/browser/extensions/api/networking_private/networking_private_factory_linux.h
index 3ad313ee..fcf1252 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_factory_linux.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_factory_linux.h
@@ -25,13 +25,13 @@
friend struct DefaultSingletonTraits<NetworkingPrivateLinuxFactory>;
NetworkingPrivateLinuxFactory();
- virtual ~NetworkingPrivateLinuxFactory();
+ ~NetworkingPrivateLinuxFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* browser_context) const override;
- virtual bool ServiceIsCreatedWithBrowserContext() const override;
- virtual bool ServiceIsNULLWhileTesting() const override;
+ bool ServiceIsCreatedWithBrowserContext() const override;
+ bool ServiceIsNULLWhileTesting() const override;
DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateLinuxFactory);
};
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_linux.h b/chrome/browser/extensions/api/networking_private/networking_private_linux.h
index 19707be4..2f3e1de7 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_linux.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_linux.h
@@ -34,71 +34,66 @@
explicit NetworkingPrivateLinux(content::BrowserContext* browser_context);
// NetworkingPrivateDelegate
- virtual void GetProperties(const std::string& guid,
- const DictionaryCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void GetManagedProperties(
- const std::string& guid,
- const DictionaryCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void GetState(const std::string& guid,
- const DictionaryCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void SetProperties(const std::string& guid,
- scoped_ptr<base::DictionaryValue> properties,
- const VoidCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void CreateNetwork(bool shared,
- scoped_ptr<base::DictionaryValue> properties,
- const StringCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void GetNetworks(const std::string& network_type,
- bool configured_only,
- bool visible_only,
- int limit,
- const NetworkListCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void StartConnect(const std::string& guid,
- const VoidCallback& success_callback,
+ void GetProperties(const std::string& guid,
+ const DictionaryCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void GetManagedProperties(const std::string& guid,
+ const DictionaryCallback& success_callback,
const FailureCallback& failure_callback) override;
- virtual void StartDisconnect(
- const std::string& guid,
- const VoidCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void VerifyDestination(
- const VerificationProperties& verification_properties,
- const BoolCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void VerifyAndEncryptCredentials(
+ void GetState(const std::string& guid,
+ const DictionaryCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void SetProperties(const std::string& guid,
+ scoped_ptr<base::DictionaryValue> properties,
+ const VoidCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void CreateNetwork(bool shared,
+ scoped_ptr<base::DictionaryValue> properties,
+ const StringCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void GetNetworks(const std::string& network_type,
+ bool configured_only,
+ bool visible_only,
+ int limit,
+ const NetworkListCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void StartConnect(const std::string& guid,
+ const VoidCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void StartDisconnect(const std::string& guid,
+ const VoidCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void VerifyDestination(const VerificationProperties& verification_properties,
+ const BoolCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void VerifyAndEncryptCredentials(
const std::string& guid,
const VerificationProperties& verification_properties,
const StringCallback& success_callback,
const FailureCallback& failure_callback) override;
- virtual void VerifyAndEncryptData(
+ void VerifyAndEncryptData(
const VerificationProperties& verification_properties,
const std::string& data,
const StringCallback& success_callback,
const FailureCallback& failure_callback) override;
- virtual void SetWifiTDLSEnabledState(
+ void SetWifiTDLSEnabledState(
const std::string& ip_or_mac_address,
bool enabled,
const StringCallback& success_callback,
const FailureCallback& failure_callback) override;
- virtual void GetWifiTDLSStatus(
- const std::string& ip_or_mac_address,
- const StringCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual void GetCaptivePortalStatus(
- const std::string& guid,
- const StringCallback& success_callback,
- const FailureCallback& failure_callback) override;
- virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override;
- virtual bool EnableNetworkType(const std::string& type) override;
- virtual bool DisableNetworkType(const std::string& type) override;
- virtual bool RequestScan() override;
+ void GetWifiTDLSStatus(const std::string& ip_or_mac_address,
+ const StringCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ void GetCaptivePortalStatus(const std::string& guid,
+ const StringCallback& success_callback,
+ const FailureCallback& failure_callback) override;
+ scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override;
+ bool EnableNetworkType(const std::string& type) override;
+ bool DisableNetworkType(const std::string& type) override;
+ bool RequestScan() override;
private:
- virtual ~NetworkingPrivateLinux();
+ ~NetworkingPrivateLinux() override;
// https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_DEVICE_TYPE
enum DeviceType {
diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
index b29474b..887a369 100644
--- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
+++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
@@ -68,7 +68,7 @@
class ExtensionControlledPrefsTest : public PrefsPrepopulatedTestBase {
public:
ExtensionControlledPrefsTest();
- virtual ~ExtensionControlledPrefsTest();
+ ~ExtensionControlledPrefsTest() override;
void RegisterPreferences(user_prefs::PrefRegistrySyncable* registry) override;
void InstallExtensionControlledPref(Extension* extension,
@@ -457,7 +457,7 @@
public:
ControlledPrefsDisableExtensions()
: iteration_(0) {}
- virtual ~ControlledPrefsDisableExtensions() {}
+ ~ControlledPrefsDisableExtensions() override {}
void Initialize() override {
InstallExtensionControlledPref(
extension1(), kPref1, new base::StringValue("val1"));
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
index 95908d8..0c82f6e 100644
--- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
@@ -109,7 +109,7 @@
class PreferencesPrivateApiTest : public ExtensionApiTest {
public:
PreferencesPrivateApiTest() : browser_(NULL), service_(NULL) {}
- virtual ~PreferencesPrivateApiTest() {}
+ ~PreferencesPrivateApiTest() override {}
void SetUpCommandLine(CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
index 65c13d9..26551fc8 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -77,7 +77,7 @@
ExtensionApiTest::SetUpCommandLine(command_line);
}
- virtual void SetUp() override {
+ void SetUp() override {
invalidation::ProfileInvalidationProviderFactory::GetInstance()->
RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
ExtensionApiTest::SetUp();
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
index 9777a4d..76a3ef59 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
@@ -37,10 +37,9 @@
sync_setup_helper_.reset(new SyncSetupHelper());
}
- virtual ~PushMessagingCanaryTest() {
- }
+ ~PushMessagingCanaryTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
CommandLine* command_line = CommandLine::ForCurrentProcess();
ASSERT_TRUE(command_line->HasSwitch(kPasswordFileForTest));
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
index 93d99ae..0c22acd 100644
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
@@ -29,7 +29,7 @@
public:
ScreenlockPrivateApiTest() {}
- virtual ~ScreenlockPrivateApiTest() {}
+ ~ScreenlockPrivateApiTest() override {}
// ExtensionApiTest
void SetUpCommandLine(CommandLine* command_line) override {
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
index 7dc2fd06..41454ba 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
@@ -149,7 +149,7 @@
class ExtensionSignedInDevicesTest : public ExtensionApiUnittest {
public:
- virtual void SetUp() {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
ProfileSyncServiceFactory::GetInstance()->SetTestingFactory(
diff --git a/chrome/browser/extensions/api/socket/socket_api_unittest.cc b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
index f24024a..7634f1e9 100644
--- a/chrome/browser/extensions/api/socket/socket_api_unittest.cc
+++ b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
@@ -25,7 +25,7 @@
class SocketUnitTest : public ExtensionApiUnittest {
public:
- virtual void SetUp() {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
ApiResourceManager<Socket>::GetFactoryInstance()->SetTestingFactoryAndUse(
diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
index edff9ca..a427bd0 100644
--- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
@@ -113,7 +113,7 @@
public:
TLSSocketTest() {}
- virtual void SetUp() {
+ void SetUp() override {
net::AddressList address_list;
// |ssl_socket_| is owned by |socket_|. TLSSocketTest keeps a pointer to
// it to expect invocations from TLSSocket to |ssl_socket_|.
@@ -123,7 +123,7 @@
EXPECT_CALL(*ssl_socket_, Disconnect()).Times(1);
};
- virtual void TearDown() {
+ void TearDown() override {
ssl_socket_ = NULL;
socket_.reset();
};
diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
index 02ef2fb..1a31f09 100644
--- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
@@ -36,7 +36,7 @@
class SocketsTcpServerUnitTest : public ExtensionApiUnittest {
public:
- virtual void SetUp() {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
ApiResourceManager<ResumableTCPSocket>::GetFactoryInstance()
diff --git a/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc b/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
index 78299fe..08d407bd 100644
--- a/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
@@ -31,7 +31,7 @@
class SocketsUdpUnitTest : public ExtensionApiUnittest {
public:
- virtual void SetUp() {
+ void SetUp() override {
ExtensionApiUnittest::SetUp();
ApiResourceManager<ResumableUDPSocket>::GetFactoryInstance()
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index 72c283a1..a1e02c92 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -87,9 +87,9 @@
public:
PolicyValueStoreTest()
: file_thread_(content::BrowserThread::FILE, &loop_) {}
- virtual ~PolicyValueStoreTest() {}
+ ~PolicyValueStoreTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
observers_ = new SettingsObserverList();
observers_->AddObserver(&observer_);
@@ -100,7 +100,7 @@
new LeveldbValueStore(scoped_temp_dir_.path()))));
}
- virtual void TearDown() override {
+ void TearDown() override {
observers_->RemoveObserver(&observer_);
store_.reset();
}
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 752b899e..9ed1922f 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -204,7 +204,7 @@
sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest(
sync_processor_.get())) {}
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
profile_.reset(new TestingProfile(temp_dir_.path()));
storage_factory_->Reset(new LeveldbSettingsStorageFactory());
@@ -217,7 +217,7 @@
profile_.get(), &util::MockExtensionSystemWithEventRouter::Build);
}
- virtual void TearDown() override {
+ void TearDown() override {
frontend_.reset();
profile_.reset();
// Execute any pending deletion tasks.
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
index a0667722..cfa85fd 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
@@ -132,7 +132,7 @@
public:
StreamsPrivateApiTest() {}
- virtual ~StreamsPrivateApiTest() {}
+ ~StreamsPrivateApiTest() override {}
void SetUpOnMainThread() override {
// Init test server.
diff --git a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc
index d7c8215..d849f3b 100644
--- a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc
+++ b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc
@@ -71,7 +71,7 @@
class SyncedNotificationsShimTest : public testing::Test {
public:
SyncedNotificationsShimTest();
- virtual ~SyncedNotificationsShimTest();
+ ~SyncedNotificationsShimTest() override;
// Starts sync for both sync types.
void StartSync();
diff --git a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
index dade8f7..5108f56 100644
--- a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
+++ b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
@@ -39,7 +39,7 @@
class SystemCpuApiTest: public ExtensionApiTest {
public:
SystemCpuApiTest() {}
- virtual ~SystemCpuApiTest() {}
+ ~SystemCpuApiTest() override {}
void SetUpInProcessBrowserTestFixture() override {
ExtensionApiTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
index 27716b26..c0418f4 100644
--- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc
+++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
@@ -165,7 +165,7 @@
SystemDisplayApiTest() : provider_(new MockDisplayInfoProvider),
screen_(new MockScreen) {}
- virtual ~SystemDisplayApiTest() {}
+ ~SystemDisplayApiTest() override {}
void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
index ee9b5b9b..a3ca7f9 100644
--- a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
+++ b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
@@ -26,7 +26,7 @@
class SystemMemoryApiTest: public ExtensionApiTest {
public:
SystemMemoryApiTest() {}
- virtual ~SystemMemoryApiTest() {}
+ ~SystemMemoryApiTest() override {}
void SetUpInProcessBrowserTestFixture() override {
ExtensionApiTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
index c5353741..ac8a7a1 100644
--- a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
+++ b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
@@ -69,7 +69,7 @@
class SystemStorageApiTest : public ExtensionApiTest {
public:
SystemStorageApiTest() {}
- virtual ~SystemStorageApiTest() {}
+ ~SystemStorageApiTest() override {}
void SetUpOnMainThread() override {
TestStorageMonitor::CreateForBrowserTests();
diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
index 2164a05..6bcd342 100644
--- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
+++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
@@ -32,7 +32,7 @@
class SystemStorageEjectApiTest : public ExtensionApiTest {
public:
SystemStorageEjectApiTest() : monitor_(NULL) {}
- virtual ~SystemStorageEjectApiTest() {}
+ ~SystemStorageEjectApiTest() override {}
protected:
void SetUpOnMainThread() override {
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 4913d80..367dc268 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -41,7 +41,7 @@
class TabCaptureApiPixelTest : public TabCaptureApiTest {
public:
- virtual void SetUp() override {
+ void SetUp() override {
EnablePixelOutput();
TabCaptureApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
index 74d8a53..301db45 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
@@ -98,7 +98,7 @@
return suffix;
}
- virtual void SetUp() override {
+ void SetUp() override {
EnablePixelOutput();
ExtensionApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
index 408ec247..7943327 100644
--- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
+++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
@@ -33,21 +33,21 @@
class AshPanelWindowController : public extensions::WindowController {
public:
AshPanelWindowController(AppWindow* window, Profile* profile);
- virtual ~AshPanelWindowController();
+ ~AshPanelWindowController() override;
void NativeWindowChanged();
// Overridden from extensions::WindowController.
- virtual int GetWindowId() const override;
- virtual std::string GetWindowTypeText() const override;
- virtual base::DictionaryValue* CreateWindowValueWithTabs(
+ int GetWindowId() const override;
+ std::string GetWindowTypeText() const override;
+ base::DictionaryValue* CreateWindowValueWithTabs(
const extensions::Extension* extension) const override;
- virtual base::DictionaryValue* CreateTabValue(
- const extensions::Extension* extension, int tab_index) const override;
- virtual bool CanClose(Reason* reason) const override;
- virtual void SetFullscreenMode(bool is_fullscreen,
- const GURL& extension_url) const override;
- virtual bool IsVisibleToExtension(
+ base::DictionaryValue* CreateTabValue(const extensions::Extension* extension,
+ int tab_index) const override;
+ bool CanClose(Reason* reason) const override;
+ void SetFullscreenMode(bool is_fullscreen,
+ const GURL& extension_url) const override;
+ bool IsVisibleToExtension(
const extensions::Extension* extension) const override;
private:
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
index 58565aa..9c11365 100644
--- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h
+++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
@@ -37,25 +37,23 @@
public extensions::ExtensionFunctionDispatcher::Delegate {
public:
explicit AshPanelContents(extensions::AppWindow* host);
- virtual ~AshPanelContents();
+ ~AshPanelContents() override;
// extensions::AppWindowContents
- virtual void Initialize(content::BrowserContext* context,
- const GURL& url) override;
- virtual void LoadContents(int32 creator_process_id) override;
- virtual void NativeWindowChanged(
+ void Initialize(content::BrowserContext* context, const GURL& url) override;
+ void LoadContents(int32 creator_process_id) override;
+ void NativeWindowChanged(
extensions::NativeAppWindow* native_app_window) override;
- virtual void NativeWindowClosed() override;
- virtual void DispatchWindowShownForTests() const override;
- virtual content::WebContents* GetWebContents() const override;
+ void NativeWindowClosed() override;
+ void DispatchWindowShownForTests() const override;
+ content::WebContents* GetWebContents() const override;
// LauncherFaviconLoader::Delegate overrides:
- virtual void FaviconUpdated() override;
+ void FaviconUpdated() override;
// extensions::ExtensionFunctionDispatcher::Delegate
- virtual extensions::WindowController* GetExtensionWindowController() const
- override;
- virtual content::WebContents* GetAssociatedWebContents() const override;
+ extensions::WindowController* GetExtensionWindowController() const override;
+ content::WebContents* GetAssociatedWebContents() const override;
LauncherFaviconLoader* launcher_favicon_loader_for_test() {
return launcher_favicon_loader_.get();
@@ -63,7 +61,7 @@
private:
// content::WebContentsObserver
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
void OnRequest(const ExtensionHostMsg_Request_Params& params);
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.h b/chrome/browser/extensions/api/tabs/windows_event_router.h
index ce07000..e7c99fe 100644
--- a/chrome/browser/extensions/api/tabs/windows_event_router.h
+++ b/chrome/browser/extensions/api/tabs/windows_event_router.h
@@ -42,8 +42,8 @@
void OnWindowControllerRemoved(WindowController* window) override;
#if defined(TOOLKIT_VIEWS)
- virtual void OnNativeFocusChange(gfx::NativeView focused_before,
- gfx::NativeView focused_now) override;
+ void OnNativeFocusChange(gfx::NativeView focused_before,
+ gfx::NativeView focused_now) override;
#endif
// content::NotificationObserver.
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
index 3d99879..2ddd9b9b 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
@@ -14,7 +14,7 @@
class FrameNavigationStateTest : public ChromeRenderViewHostTestHarness {
protected:
FrameNavigationStateTest() {}
- virtual ~FrameNavigationStateTest() {}
+ ~FrameNavigationStateTest() override {}
FrameNavigationState navigation_state_;
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 937e058d..a36a55b 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -254,7 +254,7 @@
class WebNavigationApiTest : public ExtensionApiTest {
public:
WebNavigationApiTest() {}
- virtual ~WebNavigationApiTest() {}
+ ~WebNavigationApiTest() override {}
void SetUpInProcessBrowserTestFixture() override {
ExtensionApiTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 4f5355e..bc632526 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -179,7 +179,7 @@
event_router_(new EventRouterForwarder) {}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(profile_manager_.SetUp());
ChromeNetworkDelegate::InitializePrefsOnUIThread(
&enable_referrers_, NULL, NULL, profile_.GetTestingPrefService());
@@ -777,7 +777,7 @@
event_router_(new EventRouterForwarder) {}
protected:
- virtual void SetUp() {
+ void SetUp() override {
ASSERT_TRUE(profile_manager_.SetUp());
ChromeNetworkDelegate::InitializePrefsOnUIThread(
&enable_referrers_, NULL, NULL, profile_.GetTestingPrefService());
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index 602ceb6c..edddf023 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -29,7 +29,7 @@
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
protected:
- virtual void SetUp() override;
+ void SetUp() override;
protected:
net::TestURLRequestContext context;
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
index d486ac6..2c5df18 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
@@ -371,7 +371,7 @@
class HangoutServicesBrowserTest : public AudioWaitingExtensionTest {
public:
- virtual void SetUp() override {
+ void SetUp() override {
// Make sure the Hangout Services component extension gets loaded.
ComponentLoader::EnableBackgroundExtensionsForTesting();
AudioWaitingExtensionTest::SetUp();
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index a462e58..3c4728a 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -93,7 +93,7 @@
class ExtensionWebstorePrivateApiTest : public ExtensionApiTest {
public:
ExtensionWebstorePrivateApiTest() {}
- virtual ~ExtensionWebstorePrivateApiTest() {}
+ ~ExtensionWebstorePrivateApiTest() override {}
void SetUpCommandLine(CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index fc1ea8b3..2059f81 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -126,8 +126,7 @@
public:
AppBackgroundPageNaClTest()
: extension_(NULL) {}
- virtual ~AppBackgroundPageNaClTest() {
- }
+ ~AppBackgroundPageNaClTest() override {}
void SetUpOnMainThread() override {
AppBackgroundPageApiTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/app_sync_data_unittest.cc b/chrome/browser/extensions/app_sync_data_unittest.cc
index ed69be9b..e4c19ee 100644
--- a/chrome/browser/extensions/app_sync_data_unittest.cc
+++ b/chrome/browser/extensions/app_sync_data_unittest.cc
@@ -19,7 +19,7 @@
class AppSyncDataTest : public testing::Test {
public:
AppSyncDataTest() {}
- virtual ~AppSyncDataTest() {}
+ ~AppSyncDataTest() override {}
void SetRequiredExtensionValues(
sync_pb::ExtensionSpecifics* extension_specifics) {
diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
index 5d73ed7..6850826 100644
--- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc
+++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
@@ -37,7 +37,7 @@
class BookmarkAppHelperTest : public testing::Test {
public:
BookmarkAppHelperTest() {}
- virtual ~BookmarkAppHelperTest() {}
+ ~BookmarkAppHelperTest() override {}
private:
DISALLOW_COPY_AND_ASSIGN(BookmarkAppHelperTest);
@@ -47,16 +47,16 @@
: public extensions::ExtensionServiceTestBase {
public:
BookmarkAppHelperExtensionServiceTest() {}
- virtual ~BookmarkAppHelperExtensionServiceTest() {}
+ ~BookmarkAppHelperExtensionServiceTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
extensions::ExtensionServiceTestBase::SetUp();
InitializeEmptyExtensionService();
service_->Init();
EXPECT_EQ(0u, service_->extensions()->size());
}
- virtual void TearDown() override {
+ void TearDown() override {
ExtensionServiceTestBase::TearDown();
for (content::RenderProcessHost::iterator i(
content::RenderProcessHost::AllHostsIterator());
diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
index 422194c3..c26e52f8 100644
--- a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
+++ b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc
@@ -22,13 +22,13 @@
class BrowserPermissionsPolicyDelegateTest : public testing::Test {
protected:
- virtual void SetUp() {
+ void SetUp() override {
profile_manager_.reset(
new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
ASSERT_TRUE(profile_manager_->SetUp());
profile_ = profile_manager_->CreateTestingProfile("test");
}
- virtual void TearDown() {
+ void TearDown() override {
// Need to delete profile here before the UI thread is destroyed.
profile_manager_->DeleteTestingProfile("test");
profile_manager_.reset();
diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
index 34b80065a..ccd7c1e 100644
--- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc
+++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
@@ -151,7 +151,7 @@
class ChromeAppSortingInitialize : public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingInitialize() {}
- virtual ~ChromeAppSortingInitialize() {}
+ ~ChromeAppSortingInitialize() override {}
void Initialize() override {
// A preference determining the order of which the apps appear on the NTP.
@@ -219,7 +219,7 @@
class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingInitializeWithNoApps() {}
- virtual ~ChromeAppSortingInitializeWithNoApps() {}
+ ~ChromeAppSortingInitializeWithNoApps() override {}
void Initialize() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -267,7 +267,7 @@
: public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingMigrateAppIndexInvalid() {}
- virtual ~ChromeAppSortingMigrateAppIndexInvalid() {}
+ ~ChromeAppSortingMigrateAppIndexInvalid() override {}
void Initialize() override {
// A preference determining the order of which the apps appear on the NTP.
@@ -303,7 +303,7 @@
: public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingFixNTPCollisionsAllCollide() {}
- virtual ~ChromeAppSortingFixNTPCollisionsAllCollide() {}
+ ~ChromeAppSortingFixNTPCollisionsAllCollide() override {}
void Initialize() override {
repeated_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
@@ -359,7 +359,7 @@
: public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {}
- virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {}
+ ~ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() override {}
void Initialize() override {
first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
@@ -417,7 +417,7 @@
: public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {}
- virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {}
+ ~ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() override {}
void Initialize() override {
first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
@@ -475,7 +475,7 @@
: public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingFixNTPCollisionsTwoCollisions() {}
- virtual ~ChromeAppSortingFixNTPCollisionsTwoCollisions() {}
+ ~ChromeAppSortingFixNTPCollisionsTwoCollisions() override {}
void Initialize() override {
first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
@@ -543,7 +543,7 @@
: public PrefsPrepopulatedTestBase {
public :
ChromeAppSortingEnsureValidOrdinals() {}
- virtual ~ChromeAppSortingEnsureValidOrdinals() {}
+ ~ChromeAppSortingEnsureValidOrdinals() override {}
void Initialize() override {}
void Verify() override {
@@ -568,7 +568,7 @@
class ChromeAppSortingPageOrdinalMapping : public PrefsPrepopulatedTestBase {
public:
ChromeAppSortingPageOrdinalMapping() {}
- virtual ~ChromeAppSortingPageOrdinalMapping() {}
+ ~ChromeAppSortingPageOrdinalMapping() override {}
void Initialize() override {}
void Verify() override {
@@ -650,7 +650,7 @@
app1_ = app1_scoped_.get();
app2_ = app2_scoped_.get();
}
- virtual ~ChromeAppSortingPreinstalledAppsBase() {}
+ ~ChromeAppSortingPreinstalledAppsBase() override {}
protected:
// Weak references, for convenience.
@@ -666,7 +666,7 @@
: public ChromeAppSortingPreinstalledAppsBase {
public:
ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage() {}
- virtual ~ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage() {}
+ ~ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage() override {}
void Initialize() override {}
void Verify() override {
@@ -711,7 +711,7 @@
: public ChromeAppSortingPreinstalledAppsBase {
public:
ChromeAppSortingKeepEmptyStringOrdinalPages() {}
- virtual ~ChromeAppSortingKeepEmptyStringOrdinalPages() {}
+ ~ChromeAppSortingKeepEmptyStringOrdinalPages() override {}
void Initialize() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -750,7 +750,7 @@
: public ChromeAppSortingPreinstalledAppsBase {
public:
ChromeAppSortingMakesFillerOrdinals() {}
- virtual ~ChromeAppSortingMakesFillerOrdinals() {}
+ ~ChromeAppSortingMakesFillerOrdinals() override {}
void Initialize() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -783,7 +783,7 @@
class ChromeAppSortingDefaultOrdinalsBase : public ChromeAppSortingTest {
public:
ChromeAppSortingDefaultOrdinalsBase() {}
- virtual ~ChromeAppSortingDefaultOrdinalsBase() {}
+ ~ChromeAppSortingDefaultOrdinalsBase() override {}
void Initialize() override {
app_ = CreateApp("app");
@@ -844,7 +844,7 @@
: public ChromeAppSortingDefaultOrdinalsBase {
public:
ChromeAppSortingDefaultOrdinals() {}
- virtual ~ChromeAppSortingDefaultOrdinals() {}
+ ~ChromeAppSortingDefaultOrdinals() override {}
void Verify() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -862,7 +862,7 @@
: public ChromeAppSortingDefaultOrdinalsBase {
public:
ChromeAppSortingDefaultOrdinalOverriddenByInstallPage() {}
- virtual ~ChromeAppSortingDefaultOrdinalOverriddenByInstallPage() {}
+ ~ChromeAppSortingDefaultOrdinalOverriddenByInstallPage() override {}
void Verify() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -892,7 +892,7 @@
: public ChromeAppSortingDefaultOrdinalsBase {
public:
ChromeAppSortingDefaultOrdinalOverriddenByUserValue() {}
- virtual ~ChromeAppSortingDefaultOrdinalOverriddenByUserValue() {}
+ ~ChromeAppSortingDefaultOrdinalOverriddenByUserValue() override {}
void Verify() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -925,7 +925,7 @@
: public ChromeAppSortingDefaultOrdinalsBase {
public:
ChromeAppSortingDefaultOrdinalNoCollision() {}
- virtual ~ChromeAppSortingDefaultOrdinalNoCollision() {}
+ ~ChromeAppSortingDefaultOrdinalNoCollision() override {}
void Verify() override {
AppSorting* app_sorting = prefs()->app_sorting();
@@ -964,7 +964,7 @@
class ChromeAppSortingSetExtensionVisible : public ChromeAppSortingTest {
public:
ChromeAppSortingSetExtensionVisible() {}
- virtual ~ChromeAppSortingSetExtensionVisible() {}
+ ~ChromeAppSortingSetExtensionVisible() override {}
void Initialize() override {
first_app_ = prefs_.AddApp("first_app");
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 9a8cfb8..a608afb7 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -84,7 +84,7 @@
&profile_) {
}
- virtual void SetUp() override {
+ void SetUp() override {
extension_path_ =
GetBasePath().AppendASCII("good")
.AppendASCII("Extensions")
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index 6dc2f46..f6af4ad8 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -166,7 +166,7 @@
class ContentVerifierTest : public ExtensionBrowserTest {
public:
ContentVerifierTest() {}
- virtual ~ContentVerifierTest() {}
+ ~ContentVerifierTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc
index 8cc3079..25db9107 100644
--- a/chrome/browser/extensions/default_apps_unittest.cc
+++ b/chrome/browser/extensions/default_apps_unittest.cc
@@ -31,7 +31,8 @@
class DefaultAppsTest : public testing::Test {
public:
DefaultAppsTest() : ui_thread_(content::BrowserThread::UI, &loop_) {}
- virtual ~DefaultAppsTest() {}
+ ~DefaultAppsTest() override {}
+
private:
base::MessageLoopForIO loop_;
content::TestBrowserThread ui_thread_;
diff --git a/chrome/browser/extensions/display_info_provider_aura.h b/chrome/browser/extensions/display_info_provider_aura.h
index 16fef834..7456283 100644
--- a/chrome/browser/extensions/display_info_provider_aura.h
+++ b/chrome/browser/extensions/display_info_provider_aura.h
@@ -12,16 +12,16 @@
class DisplayInfoProviderAura : public DisplayInfoProvider {
public:
DisplayInfoProviderAura();
- virtual ~DisplayInfoProviderAura();
+ ~DisplayInfoProviderAura() override;
// DisplayInfoProvider implementation.
- virtual bool SetInfo(const std::string& display_id,
- const core_api::system_display::DisplayProperties& info,
- std::string* error) override;
- virtual void UpdateDisplayUnitInfoForPlatform(
+ bool SetInfo(const std::string& display_id,
+ const core_api::system_display::DisplayProperties& info,
+ std::string* error) override;
+ void UpdateDisplayUnitInfoForPlatform(
const gfx::Display& display,
core_api::system_display::DisplayUnitInfo* unit) override;
- virtual gfx::Screen* GetActiveScreen() override;
+ gfx::Screen* GetActiveScreen() override;
private:
DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderAura);
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc
index e7857a2e..f5ffa2a 100644
--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -127,7 +127,7 @@
class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
public:
ErrorConsoleBrowserTest() : error_console_(NULL) { }
- virtual ~ErrorConsoleBrowserTest() { }
+ ~ErrorConsoleBrowserTest() override {}
protected:
// A helper class in order to wait for the proper number of errors to be
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 768bc9c..08cf532 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -30,9 +30,9 @@
class ErrorConsoleUnitTest : public testing::Test {
public:
ErrorConsoleUnitTest() : error_console_(NULL) { }
- virtual ~ErrorConsoleUnitTest() { }
+ ~ErrorConsoleUnitTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
testing::Test::SetUp();
// Errors are only kept if we have the FeatureSwitch and have Developer Mode
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
index 6927e7fa..fc3c29e0e 100644
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -100,7 +100,7 @@
dummy.reset(new base::PowerMonitor(power_monitor_source.Pass()));
}
- virtual void SetUp() {
+ void SetUp() override {
ASSERT_TRUE(profile_manager_.SetUp());
// Inject a BrowserProcess with a ProfileManager.
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 657eaaf..b0348e3 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -88,7 +88,7 @@
io_thread_(BrowserThread::IO) {
}
- virtual ~ExtensionActionIconFactoryTest() {}
+ ~ExtensionActionIconFactoryTest() override {}
void WaitForIconUpdate() {
quit_in_icon_updated_ = true;
@@ -129,7 +129,7 @@
}
// testing::Test overrides:
- virtual void SetUp() override {
+ void SetUp() override {
file_thread_.Start();
io_thread_.Start();
profile_.reset(new TestingProfile);
@@ -139,7 +139,7 @@
CreateExtensionService(&command_line, base::FilePath(), false);
}
- virtual void TearDown() override {
+ void TearDown() override {
profile_.reset(); // Get all DeleteSoon calls sent to ui_loop_.
ui_loop_.RunUntilIdle();
}
diff --git a/chrome/browser/extensions/extension_api_unittest.h b/chrome/browser/extensions/extension_api_unittest.h
index c210f8b..3f0c91c 100644
--- a/chrome/browser/extensions/extension_api_unittest.h
+++ b/chrome/browser/extensions/extension_api_unittest.h
@@ -40,7 +40,7 @@
class ExtensionApiUnittest : public BrowserWithTestWindowTest {
public:
ExtensionApiUnittest();
- virtual ~ExtensionApiUnittest();
+ ~ExtensionApiUnittest() override;
content::WebContents* contents() { return contents_; }
@@ -52,7 +52,7 @@
protected:
// SetUp creates and loads an empty, unpacked Extension.
- virtual void SetUp() override;
+ void SetUp() override;
// Creates a background page for |extension_|, and sets it for the WebContents
// to be used in API calls.
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index 3b3a06b..6717cbb 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -61,7 +61,7 @@
};
ExtensionApiTest();
- virtual ~ExtensionApiTest();
+ ~ExtensionApiTest() override;
protected:
// InProcessBrowserTest:
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 863d0b4..7f41236 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -57,7 +57,7 @@
};
ExtensionBrowserTest();
- virtual ~ExtensionBrowserTest();
+ ~ExtensionBrowserTest() override;
// Useful accessors.
ExtensionService* extension_service() {
@@ -75,7 +75,7 @@
const extensions::ExtensionSet* extensions, const base::FilePath& path);
// InProcessBrowserTest
- virtual void SetUp() override;
+ void SetUp() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpOnMainThread() override;
diff --git a/chrome/browser/extensions/extension_creator_filter_unittest.cc b/chrome/browser/extensions/extension_creator_filter_unittest.cc
index 4755299..c56e0cc 100644
--- a/chrome/browser/extensions/extension_creator_filter_unittest.cc
+++ b/chrome/browser/extensions/extension_creator_filter_unittest.cc
@@ -13,7 +13,7 @@
class ExtensionCreatorFilterTest : public PlatformTest {
protected:
- virtual void SetUp() {
+ void SetUp() override {
PlatformTest::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
diff --git a/chrome/browser/extensions/extension_error_controller_unittest.cc b/chrome/browser/extensions/extension_error_controller_unittest.cc
index dcead3d..3007a43 100644
--- a/chrome/browser/extensions/extension_error_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_error_controller_unittest.cc
@@ -104,7 +104,7 @@
class ExtensionErrorControllerUnitTest : public ExtensionServiceTestBase {
protected:
- virtual void SetUp() override;
+ void SetUp() override;
// Add an extension to chrome, and mark it as blacklisted in the prefs.
testing::AssertionResult AddBlacklistedExtension(const Extension* extension);
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index d835a12..46f963c 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -198,11 +198,10 @@
unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {
}
- virtual ~ExtensionGCMAppHandlerTest() {
- }
+ ~ExtensionGCMAppHandlerTest() override {}
// Overridden from test::Test:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
// Make BrowserThread work in unittest.
@@ -253,7 +252,7 @@
gcm_app_handler_.reset(new FakeExtensionGCMAppHandler(profile(), &waiter_));
}
- virtual void TearDown() override {
+ void TearDown() override {
#if defined(OS_CHROMEOS)
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index 9ccac69..36dbf5a6 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -30,7 +30,7 @@
file_thread_(BrowserThread::FILE),
io_thread_(BrowserThread::IO) {}
- virtual ~ExtensionIconManagerTest() {}
+ ~ExtensionIconManagerTest() override {}
void ImageLoadObserved() {
unwaited_image_loads_++;
@@ -50,7 +50,7 @@
}
private:
- virtual void SetUp() {
+ void SetUp() override {
file_thread_.Start();
io_thread_.Start();
}
diff --git a/chrome/browser/extensions/extension_install_checker_unittest.cc b/chrome/browser/extensions/extension_install_checker_unittest.cc
index a726607..7f3ff309 100644
--- a/chrome/browser/extensions/extension_install_checker_unittest.cc
+++ b/chrome/browser/extensions/extension_install_checker_unittest.cc
@@ -146,7 +146,7 @@
class ExtensionInstallCheckerTest : public testing::Test {
public:
ExtensionInstallCheckerTest() {}
- virtual ~ExtensionInstallCheckerTest() {}
+ ~ExtensionInstallCheckerTest() override {}
void RunSecondInvocation(ExtensionInstallCheckerForTest* checker,
int checks_failed) {
@@ -324,7 +324,7 @@
: public ExtensionInstallCheckerTest {
public:
ExtensionInstallCheckerMultipleInvocationTest() : callback_count_(0) {}
- virtual ~ExtensionInstallCheckerMultipleInvocationTest() {}
+ ~ExtensionInstallCheckerMultipleInvocationTest() override {}
void RunSecondInvocation(ExtensionInstallCheckerForTest* checker,
int checks_failed) {
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index 7a1c8e9..66755bb 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -46,7 +46,7 @@
class CommandsApiTest : public ExtensionApiTest {
public:
CommandsApiTest() {}
- virtual ~CommandsApiTest() {}
+ ~CommandsApiTest() override {}
protected:
BrowserActionTestUtil GetBrowserActionsBar() {
diff --git a/chrome/browser/extensions/extension_management_unittest.cc b/chrome/browser/extensions/extension_management_unittest.cc
index b984817..b3a59e4 100644
--- a/chrome/browser/extensions/extension_management_unittest.cc
+++ b/chrome/browser/extensions/extension_management_unittest.cc
@@ -62,12 +62,10 @@
typedef ExtensionManagementPrefUpdater<TestingPrefServiceSimple> PrefUpdater;
ExtensionManagementServiceTest() {}
- virtual ~ExtensionManagementServiceTest() {}
+ ~ExtensionManagementServiceTest() override {}
// testing::Test:
- virtual void SetUp() override {
- InitPrefService();
- }
+ void SetUp() override { InitPrefService(); }
void InitPrefService() {
extension_management_.reset();
@@ -126,7 +124,7 @@
class ExtensionAdminPolicyTest : public ExtensionManagementServiceTest {
public:
ExtensionAdminPolicyTest() {}
- virtual ~ExtensionAdminPolicyTest() {}
+ ~ExtensionAdminPolicyTest() override {}
void CreateExtension(Manifest::Location location) {
base::DictionaryValue values;
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index 4e72895bc..82a278a 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -399,12 +399,12 @@
service_->Init();
}
- virtual ~ExtensionMessageBubbleTest() {
+ ~ExtensionMessageBubbleTest() override {
// Make sure the profile is destroyed before the thread bundle.
profile_.reset(NULL);
}
- virtual void SetUp() {
+ void SetUp() override {
command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
}
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 9a630c38..6e5fa46 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -759,7 +759,7 @@
// Tests that blacklist state can be queried.
class ExtensionPrefsBlacklistedExtensions : public ExtensionPrefsTest {
public:
- virtual ~ExtensionPrefsBlacklistedExtensions() {}
+ ~ExtensionPrefsBlacklistedExtensions() override {}
void Initialize() override {
extension_a_ = prefs_.AddExtension("a");
@@ -839,7 +839,7 @@
// over new "blacklist_state".
class ExtensionPrefsBlacklistState : public ExtensionPrefsTest {
public:
- virtual ~ExtensionPrefsBlacklistState() {}
+ ~ExtensionPrefsBlacklistState() override {}
void Initialize() override { extension_a_ = prefs_.AddExtension("a"); }
diff --git a/chrome/browser/extensions/extension_prefs_unittest.h b/chrome/browser/extensions/extension_prefs_unittest.h
index 8228d4b5..779c33c1 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.h
+++ b/chrome/browser/extensions/extension_prefs_unittest.h
@@ -25,7 +25,7 @@
class ExtensionPrefsTest : public testing::Test {
public:
ExtensionPrefsTest();
- virtual ~ExtensionPrefsTest();
+ ~ExtensionPrefsTest() override;
// This function will get called once, and is the right place to do operations
// on ExtensionPrefs that write data.
@@ -39,9 +39,9 @@
// This function is called to Register preference default values.
virtual void RegisterPreferences(user_prefs::PrefRegistrySyncable* registry);
- virtual void SetUp() override;
+ void SetUp() override;
- virtual void TearDown() override;
+ void TearDown() override;
protected:
ExtensionPrefs* prefs() { return prefs_.prefs(); }
@@ -61,7 +61,7 @@
static const size_t kNumInstalledExtensions = 4;
PrefsPrepopulatedTestBase();
- virtual ~PrefsPrepopulatedTestBase();
+ ~PrefsPrepopulatedTestBase() override;
Extension* extension1() { return extension1_.get(); }
Extension* extension2() { return extension2_.get(); }
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 897fee71..118bb34 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -101,7 +101,7 @@
old_factory_(NULL),
resource_context_(&test_url_request_context_) {}
- virtual void SetUp() override {
+ void SetUp() override {
testing::Test::SetUp();
extension_info_map_ = new InfoMap();
net::URLRequestContext* request_context =
@@ -109,7 +109,7 @@
old_factory_ = request_context->job_factory();
}
- virtual void TearDown() {
+ void TearDown() override {
net::URLRequestContext* request_context =
resource_context_.GetRequestContext();
request_context->set_job_factory(old_factory_);
diff --git a/chrome/browser/extensions/extension_service_test_base.h b/chrome/browser/extensions/extension_service_test_base.h
index 8e5cb7a..0a4e818 100644
--- a/chrome/browser/extensions/extension_service_test_base.h
+++ b/chrome/browser/extensions/extension_service_test_base.h
@@ -59,10 +59,10 @@
protected:
ExtensionServiceTestBase();
- virtual ~ExtensionServiceTestBase();
+ ~ExtensionServiceTestBase() override;
// testing::Test implementation.
- virtual void SetUp() override;
+ void SetUp() override;
// Create a set of InitParams to install an ExtensionService into |temp_dir_|.
ExtensionServiceInitParams CreateDefaultInitParams();
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index ebf0296..d23b98e 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -6616,7 +6616,7 @@
// are provided.
class ExtensionSourcePriorityTest : public ExtensionServiceTest {
public:
- virtual void SetUp() {
+ void SetUp() override {
ExtensionServiceTest::SetUp();
// All tests use a single extension. Put the id and path in member vars
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index 9d15cd99..d62eb47 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -90,9 +90,7 @@
DISALLOW_COPY_AND_ASSIGN(PolicyChangeObserver);
};
- virtual void SetUp() override {
- policy_ = new ExtensionSpecialStoragePolicy(NULL);
- }
+ void SetUp() override { policy_ = new ExtensionSpecialStoragePolicy(NULL); }
scoped_refptr<Extension> CreateProtectedApp() {
#if defined(OS_WIN)
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 5b59b804..bfd1496 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -97,7 +97,7 @@
return true;
}
- virtual void TearDown() {
+ void TearDown() override {
EXPECT_TRUE(base::DeleteFile(preferences_file_, false));
// TODO(phajdan.jr): Check return values of the functions below, carefully.
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 27017d9..64ba4b4 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -160,7 +160,7 @@
public:
ExtensionApiCaptureTest() {}
- virtual void SetUp() override {
+ void SetUp() override {
EnablePixelOutput();
ExtensionApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index b365e4f..f4c7899 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -44,7 +44,7 @@
file_thread_(content::BrowserThread::FILE, &message_loop_) {}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
// Create an ExtensionService and ManagementPolicy to inject into the
// ExtensionSettingsHandler.
profile_.reset(new TestingProfile());
@@ -58,7 +58,7 @@
management_policy_));
}
- virtual void TearDown() override {
+ void TearDown() override {
handler_.reset();
profile_.reset();
// Execute any pending deletion tasks.
diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
index ee334c2..2a084774 100644
--- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
+++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
@@ -26,7 +26,7 @@
class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest {
public:
- virtual void SetUp() override {
+ void SetUp() override {
extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
ExtensionBrowserTest::SetUp();
}
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index ecff0e7e..2833981 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -29,7 +29,7 @@
: ui_thread_(content::BrowserThread::UI, &message_loop_) {}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
profile_.reset(new TestingProfile());
TestExtensionSystem* system =
static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile_.get()));
@@ -37,7 +37,7 @@
CommandLine::ForCurrentProcess(), base::FilePath(), false);
}
- virtual void TearDown() override {
+ void TearDown() override {
profile_.reset();
message_loop_.RunUntilIdle();
}
diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc
index 566f6bee..571c3cb 100644
--- a/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ b/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -30,7 +30,7 @@
ExternalPolicyLoaderTest() : ui_thread_(BrowserThread::UI, &loop_) {
}
- virtual ~ExternalPolicyLoaderTest() {}
+ ~ExternalPolicyLoaderTest() override {}
private:
// We need these to satisfy BrowserThread::CurrentlyOn(BrowserThread::UI)
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index ac873fe..81364e1b 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -55,7 +55,7 @@
class ExternalProviderImplTest : public ExtensionServiceTestBase {
public:
ExternalProviderImplTest() {}
- virtual ~ExternalProviderImplTest() {}
+ ~ExternalProviderImplTest() override {}
void InitServiceWithExternalProviders() {
#if defined(OS_CHROMEOS)
@@ -95,7 +95,7 @@
}
// ExtensionServiceTestBase overrides:
- virtual void SetUp() override {
+ void SetUp() override {
ExtensionServiceTestBase::SetUp();
test_server_.reset(new EmbeddedTestServer());
@@ -117,7 +117,7 @@
test_server_->GetURL(kManifestPath).spec());
}
- virtual void TearDown() override {
+ void TearDown() override {
TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
}
diff --git a/chrome/browser/extensions/favicon_downloader_unittest.cc b/chrome/browser/extensions/favicon_downloader_unittest.cc
index 8d700cc..42de071 100644
--- a/chrome/browser/extensions/favicon_downloader_unittest.cc
+++ b/chrome/browser/extensions/favicon_downloader_unittest.cc
@@ -31,8 +31,7 @@
FaviconDownloaderTest() {
}
- virtual ~FaviconDownloaderTest() {
- }
+ ~FaviconDownloaderTest() override {}
private:
DISALLOW_COPY_AND_ASSIGN(FaviconDownloaderTest);
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.h b/chrome/browser/extensions/global_shortcut_listener_x11.h
index 8d551993..ba3513ad 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.h
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -20,20 +20,18 @@
public ui::PlatformEventDispatcher {
public:
GlobalShortcutListenerX11();
- virtual ~GlobalShortcutListenerX11();
+ ~GlobalShortcutListenerX11() override;
// ui::PlatformEventDispatcher implementation.
- virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
- virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
+ bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+ uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
private:
// GlobalShortcutListener implementation.
- virtual void StartListening() override;
- virtual void StopListening() override;
- virtual bool RegisterAcceleratorImpl(
- const ui::Accelerator& accelerator) override;
- virtual void UnregisterAcceleratorImpl(
- const ui::Accelerator& accelerator) override;
+ void StartListening() override;
+ void StopListening() override;
+ bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
+ void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
// Invoked when a global shortcut is pressed.
void OnXKeyPressEvent(::XEvent* x_event);
diff --git a/chrome/browser/extensions/hotword_browsertest.cc b/chrome/browser/extensions/hotword_browsertest.cc
index 6de7de5..a1bf6171 100644
--- a/chrome/browser/extensions/hotword_browsertest.cc
+++ b/chrome/browser/extensions/hotword_browsertest.cc
@@ -26,7 +26,7 @@
class HotwordBrowserTest : public ExtensionBrowserTest {
public:
HotwordBrowserTest() : error_console_(NULL) { }
- virtual ~HotwordBrowserTest() { }
+ ~HotwordBrowserTest() override {}
protected:
void SetUpInProcessBrowserTestFixture() override {
diff --git a/chrome/browser/extensions/install_tracker_unittest.cc b/chrome/browser/extensions/install_tracker_unittest.cc
index 179f627..4e6cc6f 100644
--- a/chrome/browser/extensions/install_tracker_unittest.cc
+++ b/chrome/browser/extensions/install_tracker_unittest.cc
@@ -51,7 +51,7 @@
tracker_.reset(new InstallTracker(profile_.get(), NULL));
}
- virtual ~InstallTrackerTest() {}
+ ~InstallTrackerTest() override {}
protected:
Profile* profile() { return profile_.get(); }
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 5abc756..0c69af2a 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -81,7 +81,7 @@
class LazyBackgroundPageApiTest : public ExtensionApiTest {
public:
LazyBackgroundPageApiTest() {}
- virtual ~LazyBackgroundPageApiTest() {}
+ ~LazyBackgroundPageApiTest() override {}
void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/location_bar_controller_unittest.cc b/chrome/browser/extensions/location_bar_controller_unittest.cc
index baa17cfc..8c492d1 100644
--- a/chrome/browser/extensions/location_bar_controller_unittest.cc
+++ b/chrome/browser/extensions/location_bar_controller_unittest.cc
@@ -35,7 +35,7 @@
class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
active_script_override_.reset(new FeatureSwitch::ScopedOverride(
FeatureSwitch::scripts_require_action(), true));
@@ -54,7 +54,7 @@
&command_line, base::FilePath(), false);
}
- virtual void TearDown() override {
+ void TearDown() override {
#if defined OS_CHROMEOS
test_user_manager_.reset();
#endif
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 7948d03..3259c49 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -55,7 +55,7 @@
prefs_(message_loop_.message_loop_proxy().get()),
next_id_(1) {}
- virtual void TearDown() override {
+ void TearDown() override {
prefs_.pref_service()->CommitPendingWrite();
message_loop_.RunUntilIdle();
}
diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc
index f78ebd5e..3c89f88 100644
--- a/chrome/browser/extensions/permission_messages_unittest.cc
+++ b/chrome/browser/extensions/permission_messages_unittest.cc
@@ -39,10 +39,10 @@
public:
PermissionMessagesUnittest()
: message_provider_(new ChromePermissionMessageProvider()) {}
- virtual ~PermissionMessagesUnittest() {}
+ ~PermissionMessagesUnittest() override {}
// Overridden from testing::Test:
- virtual void SetUp() override {
+ void SetUp() override {
ExtensionServiceTestBase::SetUp();
InitializeExtensionService(CreateDefaultInitParams());
}
diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
index be1bec06..8b70ccf 100644
--- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
@@ -56,7 +56,7 @@
class SandboxedUnpackerTest : public testing::Test {
public:
- virtual void SetUp() {
+ void SetUp() override {
ASSERT_TRUE(extensions_dir_.CreateUniqueTempDir());
browser_threads_.reset(new content::TestBrowserThreadBundle(
content::TestBrowserThreadBundle::IO_MAINLOOP));
@@ -66,7 +66,7 @@
client_ = new MockSandboxedUnpackerClient;
}
- virtual void TearDown() {
+ void TearDown() override {
// Need to destruct SandboxedUnpacker before the message loop since
// it posts a task to it.
sandboxed_unpacker_ = NULL;
diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc
index c0866c10..e9b8a53 100644
--- a/chrome/browser/extensions/shared_module_service_unittest.cc
+++ b/chrome/browser/extensions/shared_module_service_unittest.cc
@@ -54,7 +54,7 @@
// run as stable channel on the official Windows build.
current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
protected:
- virtual void SetUp() override;
+ void SetUp() override;
// Install an extension and notify the ExtensionService.
testing::AssertionResult InstallExtension(const Extension* extension,
diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc
index 1d3193c..81bf15e 100644
--- a/chrome/browser/extensions/startup_helper_browsertest.cc
+++ b/chrome/browser/extensions/startup_helper_browsertest.cc
@@ -15,7 +15,7 @@
class StartupHelperBrowserTest : public InProcessBrowserTest {
public:
StartupHelperBrowserTest() {}
- virtual ~StartupHelperBrowserTest() {}
+ ~StartupHelperBrowserTest() override {}
void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitch(switches::kNoStartupWindow);
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc b/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc
index 78aa43f..510efd2 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc
+++ b/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc
@@ -17,7 +17,7 @@
class TokenCacheTest : public testing::Test {
public:
TokenCacheTest() : cache_(&profile_) {}
- virtual ~TokenCacheTest() { cache_.Shutdown(); }
+ ~TokenCacheTest() override { cache_.Shutdown(); }
size_t CacheSize() {
return cache_.token_cache_.size();
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index dee79d9..0d9b6d4 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -646,11 +646,11 @@
content::TestBrowserThreadBundle::IO_MAINLOOP) {
}
- virtual void SetUp() override {
+ void SetUp() override {
prefs_.reset(new TestExtensionPrefs(base::MessageLoopProxy::current()));
}
- virtual void TearDown() override {
+ void TearDown() override {
// Some tests create URLRequestContextGetters, whose destruction must run
// on the IO thread. Make sure the IO loop spins before shutdown so that
// those objects are released.
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 9f4b0f5..b4cc28e8 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -129,14 +129,14 @@
new SimpleTestJobURLRequestInterceptor()));
}
- virtual ~UserScriptListenerTest() {
+ ~UserScriptListenerTest() override {
net::URLRequestFilter::GetInstance()->RemoveHostnameHandler("http",
"google.com");
net::URLRequestFilter::GetInstance()->RemoveHostnameHandler("http",
"example.com");
}
- virtual void SetUp() override {
+ void SetUp() override {
ExtensionServiceTestBase::SetUp();
InitializeEmptyExtensionService();
@@ -146,7 +146,7 @@
listener_ = new UserScriptListener();
}
- virtual void TearDown() override {
+ void TearDown() override {
listener_ = NULL;
base::MessageLoop::current()->RunUntilIdle();
ExtensionServiceTestBase::TearDown();
diff --git a/chrome/browser/extensions/user_script_loader_unittest.cc b/chrome/browser/extensions/user_script_loader_unittest.cc
index 775f8279..0a03e2f 100644
--- a/chrome/browser/extensions/user_script_loader_unittest.cc
+++ b/chrome/browser/extensions/user_script_loader_unittest.cc
@@ -42,7 +42,7 @@
public:
UserScriptLoaderTest() : shared_memory_(NULL) {}
- virtual void SetUp() {
+ void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
// Register for all user script notifications.
@@ -58,7 +58,7 @@
BrowserThread::UI, base::MessageLoop::current()));
}
- virtual void TearDown() {
+ void TearDown() override {
file_thread_.reset();
ui_thread_.reset();
}
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
index da2f9351..085748f 100644
--- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
@@ -169,7 +169,7 @@
class WebstoreInlineInstallerListenerTest : public WebstoreInlineInstallerTest {
public:
WebstoreInlineInstallerListenerTest() {}
- virtual ~WebstoreInlineInstallerListenerTest() {}
+ ~WebstoreInlineInstallerListenerTest() override {}
protected:
void RunTest(const std::string& file_name) {
diff --git a/chrome/browser/extensions/webstore_inline_installer_unittest.cc b/chrome/browser/extensions/webstore_inline_installer_unittest.cc
index a5153f8..d415be25b 100644
--- a/chrome/browser/extensions/webstore_inline_installer_unittest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_unittest.cc
@@ -52,8 +52,8 @@
class WebstoreInlineInstallerTest : public ChromeRenderViewHostTestHarness {
public:
// testing::Test
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
bool TestSingleVerifiedSite(const std::string& requestor_url,
const std::string& verified_site);
diff --git a/chrome/browser/extensions/webstore_installer_test.h b/chrome/browser/extensions/webstore_installer_test.h
index 5bce75c..9dff9642 100644
--- a/chrome/browser/extensions/webstore_installer_test.h
+++ b/chrome/browser/extensions/webstore_installer_test.h
@@ -22,7 +22,7 @@
const std::string& crx_filename,
const std::string& verified_domain,
const std::string& unverified_domain);
- virtual ~WebstoreInstallerTest();
+ ~WebstoreInstallerTest() override;
void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpInProcessBrowserTestFixture() override;
diff --git a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc b/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
index b86f8961..4e59ce1 100644
--- a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
+++ b/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
@@ -37,7 +37,7 @@
kCrxFilename,
kAppDomain,
kNonAppDomain) {}
- virtual ~WebstoreReinstallerBrowserTest() {}
+ ~WebstoreReinstallerBrowserTest() override {}
void OnInstallCompletion(const base::Closure& quit_closure,
bool success,
diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
index 4a2046b..a67482d 100644
--- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
@@ -243,7 +243,7 @@
public extensions::ExtensionRegistryObserver {
public:
CommandLineWebstoreInstall() : saw_install_(false), browser_open_count_(0) {}
- virtual ~CommandLineWebstoreInstall() {}
+ ~CommandLineWebstoreInstall() override {}
void SetUpOnMainThread() override {
WebstoreStartupInstallerTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc
index 7336bacf..0c8343c 100644
--- a/chrome/browser/extensions/zipfile_installer_unittest.cc
+++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -62,7 +62,7 @@
ZipFileInstallerTest()
: browser_threads_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
- virtual void SetUp() {
+ void SetUp() override {
in_process_utility_thread_helper_.reset(
new content::InProcessUtilityThreadHelper);
@@ -76,7 +76,7 @@
registry->AddObserver(&observer_);
}
- virtual void TearDown() {
+ void TearDown() override {
// Need to destruct ZipFileInstaller before the message loop since
// it posts a task to it.
zipfile_installer_ = NULL;
