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

Unified Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 20bf3a4b598db719060bf398385d8198a3b5418e..741933fd5b8e071efaa3dd5284a20a13126da81e 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -88,7 +88,7 @@ class TestListener : public content::NotificationObserver {
virtual void Observe(int type,
const content::NotificationSource& /* source */,
- const content::NotificationDetails& details) OVERRIDE {
+ const content::NotificationDetails& details) override {
const std::string& message = *content::Details<std::string>(details).ptr();
if (message == message_)
callback_.Run();
@@ -113,21 +113,21 @@ class CryptoVerifyStub
: public extensions::NetworkingPrivateServiceClient::CryptoVerify {
virtual void VerifyDestination(const Credentials& verification_properties,
bool* verified,
- std::string* error) OVERRIDE {
+ std::string* error) override {
*verified = true;
}
virtual void VerifyAndEncryptCredentials(
const std::string& network_guid,
const Credentials& credentials,
- const VerifyAndEncryptCredentialsCallback& callback) OVERRIDE {
+ const VerifyAndEncryptCredentialsCallback& callback) override {
callback.Run("encrypted_credentials", "");
}
virtual void VerifyAndEncryptData(const Credentials& verification_properties,
const std::string& data,
std::string* base64_encoded_ciphertext,
- std::string* error) OVERRIDE {
+ std::string* error) override {
*base64_encoded_ciphertext = "encrypted_data";
}
};
@@ -152,7 +152,7 @@ class ExtensionNetworkingPrivateApiTest
kFlagEnableFileAccess | kFlagLoadAsComponent);
}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
#if defined(OS_CHROMEOS)
EXPECT_CALL(provider_, IsInitializationComplete(_))
.WillRepeatedly(Return(true));
@@ -170,7 +170,7 @@ class ExtensionNetworkingPrivateApiTest
*out = result;
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
// Whitelist the extension ID of the test extension.
command_line->AppendSwitchASCII(
@@ -243,7 +243,7 @@ class ExtensionNetworkingPrivateApiTest
type, state, true /* add_to_visible */);
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
detector_ = new NetworkPortalDetectorTestImpl();
NetworkPortalDetector::InitializeForTesting(detector_);
@@ -369,7 +369,7 @@ class ExtensionNetworkingPrivateApiTest
content::RunAllPendingInMessageLoop();
}
#else // !defined(OS_CHROMEOS)
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
// Whitelist the extension ID of the test extension.
command_line->AppendSwitchASCII(
@@ -383,7 +383,7 @@ class ExtensionNetworkingPrivateApiTest
new wifi::FakeWiFiService(), new CryptoVerifyStub());
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
content::RunAllPendingInMessageLoop();
NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory(

Powered by Google App Engine
This is Rietveld 408576698