| Index: chrome/browser/local_discovery/privet_device_lister_unittest.cc
|
| diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
|
| index 4f3b9c931007bb9c98d005907bc1245f2f617f90..80274877a5202391c6252350040a1dc96a6fe3b1 100644
|
| --- a/chrome/browser/local_discovery/privet_device_lister_unittest.cc
|
| +++ b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
|
| @@ -79,7 +79,7 @@ class MockServiceResolver : public ServiceResolver {
|
| virtual ~MockServiceResolver() {
|
| }
|
|
|
| - virtual void StartResolving() OVERRIDE {
|
| + virtual void StartResolving() override {
|
| started_resolving_ = true;
|
| mock_delegate_->ServiceResolverStarted(service_name_, this);
|
| }
|
| @@ -88,7 +88,7 @@ class MockServiceResolver : public ServiceResolver {
|
| return started_resolving_;
|
| }
|
|
|
| - virtual std::string GetName() const OVERRIDE {
|
| + virtual std::string GetName() const override {
|
| return service_name_;
|
| }
|
|
|
| @@ -116,7 +116,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
|
| // on service type |service_type|.
|
| virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
|
| const std::string& service_type,
|
| - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE {
|
| + const ServiceWatcher::UpdatedCallback& callback) override {
|
| scoped_ptr<MockServiceWatcher> mock_service_watcher(
|
| new MockServiceWatcher(service_type, callback, mock_delegate_));
|
| return mock_service_watcher.PassAs<ServiceWatcher>();
|
| @@ -126,7 +126,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
|
| // for the service called |service_name|.
|
| virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
|
| const std::string& service_name,
|
| - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE {
|
| + const ServiceResolver::ResolveCompleteCallback& callback) override {
|
| scoped_ptr<MockServiceResolver> mock_service_resolver(
|
| new MockServiceResolver(service_name, callback, mock_delegate_));
|
| return mock_service_resolver.PassAs<ServiceResolver>();
|
| @@ -136,7 +136,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
|
| virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
|
| const std::string& domain,
|
| net::AddressFamily address_family,
|
| - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE {
|
| + const LocalDomainResolver::IPAddressCallback& callback) override {
|
| NOTREACHED();
|
| return scoped_ptr<LocalDomainResolver>();
|
| }
|
| @@ -178,7 +178,7 @@ class PrivetDeviceListerTest : public testing::Test {
|
| virtual ~PrivetDeviceListerTest() {
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| example_attrs_.push_back("tXtvers=1");
|
| example_attrs_.push_back("ty=My Printer");
|
| example_attrs_.push_back("nOte=This is my Printer");
|
|
|