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

Side by Side Diff: chrome/browser/extensions/api/mdns/mdns_apitest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/api/mdns/mdns_api.h" 6 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/common/extensions/api/mdns.h" 9 #include "chrome/common/extensions/api/mdns.h"
10 #include "extensions/common/switches.h" 10 #include "extensions/common/switches.h"
(...skipping 24 matching lines...) Expand all
35 } 35 }
36 36
37 private: 37 private:
38 extensions::DnsSdRegistry::DnsSdObserver* api_; 38 extensions::DnsSdRegistry::DnsSdObserver* api_;
39 }; 39 };
40 40
41 class MDnsAPITest : public ExtensionApiTest { 41 class MDnsAPITest : public ExtensionApiTest {
42 public: 42 public:
43 MDnsAPITest() {} 43 MDnsAPITest() {}
44 44
45 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 45 virtual void SetUpCommandLine(CommandLine* command_line) override {
46 ExtensionApiTest::SetUpCommandLine(command_line); 46 ExtensionApiTest::SetUpCommandLine(command_line);
47 command_line->AppendSwitchASCII( 47 command_line->AppendSwitchASCII(
48 extensions::switches::kWhitelistedExtensionID, 48 extensions::switches::kWhitelistedExtensionID,
49 "ddchlicdkolnonkihahngkmmmjnjlkkf"); 49 "ddchlicdkolnonkihahngkmmmjnjlkkf");
50 } 50 }
51 51
52 void SetUpTestDnsSdRegistry() { 52 void SetUpTestDnsSdRegistry() {
53 extensions::MDnsAPI* api = extensions::MDnsAPI::Get(profile()); 53 extensions::MDnsAPI* api = extensions::MDnsAPI::Get(profile());
54 dns_sd_registry_ = new MockDnsSdRegistry(api); 54 dns_sd_registry_ = new MockDnsSdRegistry(api);
55 // Transfers ownership of the registry instance. 55 // Transfers ownership of the registry instance.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 DnsSdRegistry::DnsSdServiceList services; 133 DnsSdRegistry::DnsSdServiceList services;
134 134
135 extensions::DnsSdService service; 135 extensions::DnsSdService service;
136 service.service_name = service_type; 136 service.service_name = service_type;
137 services.push_back(service); 137 services.push_back(service);
138 138
139 dns_sd_registry_->DispatchMDnsEvent(service_type, services); 139 dns_sd_registry_->DispatchMDnsEvent(service_type, services);
140 dns_sd_registry_->DispatchMDnsEvent(test_service_type, services); 140 dns_sd_registry_->DispatchMDnsEvent(test_service_type, services);
141 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 141 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
142 } 142 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/mdns/mdns_api.h ('k') | chrome/browser/extensions/api/media_galleries/media_galleries_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698