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

Unified Diff: chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/local_discovery/privetv3_setup_flow_unittest.cc
diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
index 538acfc6e36f0a263077ce9f28e1d5abc8797d2f..d25f982c883adef84ae2d0a765392941b49137f6 100644
--- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
+++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
@@ -47,19 +47,19 @@ class MockPrivetHTTPClient : public PrivetHTTPClient {
PrivetJSONOperation*(const PrivetJSONOperation::ResultCallback&));
virtual void RefreshPrivetToken(
- const PrivetURLFetcher::TokenCallback& callback) OVERRIDE {
+ const PrivetURLFetcher::TokenCallback& callback) override {
callback.Run("x-privet-token");
}
virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
- const PrivetJSONOperation::ResultCallback& callback) OVERRIDE {
+ const PrivetJSONOperation::ResultCallback& callback) override {
return make_scoped_ptr(CreateInfoOperationPtr(callback));
}
virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher(
const GURL& url,
net::URLFetcher::RequestType request_type,
- PrivetURLFetcher::Delegate* delegate) OVERRIDE {
+ PrivetURLFetcher::Delegate* delegate) override {
return make_scoped_ptr(new PrivetURLFetcher(
url, request_type, request_context_.get(), delegate));
}
@@ -75,7 +75,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
public:
explicit MockGCDApiFlow(MockDelegate* delegate) : delegate_(delegate) {}
- virtual void Start(scoped_ptr<Request> request) OVERRIDE {
+ virtual void Start(scoped_ptr<Request> request) override {
ASSERT_FALSE(delegate_->gcd_request_);
delegate_->gcd_request_ = request.Pass();
delegate_->ReplyWithToken();
@@ -89,7 +89,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
MOCK_METHOD1(SwitchToSetupWiFi, void(const ResultCallback&));
virtual void CreatePrivetV3Client(
const std::string& service_name,
- const PrivetClientCallback& callback) OVERRIDE {
+ const PrivetClientCallback& callback) override {
scoped_ptr<MockPrivetHTTPClient> privet_client(new MockPrivetHTTPClient());
privet_client_ptr_ = privet_client.get();
callback.Run(privet_client.PassAs<PrivetHTTPClient>());
@@ -100,7 +100,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
MOCK_METHOD0(OnSetupDone, void());
MOCK_METHOD0(OnSetupError, void());
- virtual scoped_ptr<GCDApiFlow> CreateApiFlow() OVERRIDE {
+ virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override {
scoped_ptr<MockGCDApiFlow> mock_gcd(new MockGCDApiFlow(this));
return mock_gcd.PassAs<GCDApiFlow>();
}
@@ -130,7 +130,7 @@ class PrivetV3SetupFlowTest : public testing::Test {
}
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
quit_closure_ = run_loop_.QuitClosure();
EXPECT_CALL(delegate_, GetWiFiCredentials(_)).Times(0);
EXPECT_CALL(delegate_, SwitchToSetupWiFi(_)).Times(0);
« no previous file with comments | « chrome/browser/local_discovery/privetv3_setup_flow.cc ('k') | chrome/browser/local_discovery/pwg_raster_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698