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

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

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 12 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/extensions/api/mdns/mdns_api.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6 8 #include <utility>
7 #include <vector> 9 #include <vector>
8 10
9 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
12 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_service_test_base.h" 14 #include "chrome/browser/extensions/extension_service_test_base.h"
14 #include "chrome/browser/extensions/test_extension_system.h" 15 #include "chrome/browser/extensions/test_extension_system.h"
15 #include "chrome/common/extensions/api/mdns.h" 16 #include "chrome/common/extensions/api/mdns.h"
16 #include "content/public/browser/browser_context.h" 17 #include "content/public/browser/browser_context.h"
17 #include "content/public/test/mock_render_process_host.h" 18 #include "content/public/test/mock_render_process_host.h"
18 #include "extensions/browser/event_listener_map.h" 19 #include "extensions/browser/event_listener_map.h"
19 #include "extensions/browser/event_router_factory.h" 20 #include "extensions/browser/event_router_factory.h"
20 #include "extensions/browser/extension_prefs.h" 21 #include "extensions/browser/extension_prefs.h"
21 #include "extensions/browser/extension_registry.h" 22 #include "extensions/browser/extension_registry.h"
(...skipping 14 matching lines...) Expand all
36 37
37 // Registers a new EventListener for |service_types| in |listener_list|. 38 // Registers a new EventListener for |service_types| in |listener_list|.
38 void AddEventListener( 39 void AddEventListener(
39 const std::string& extension_id, 40 const std::string& extension_id,
40 const std::string& service_type, 41 const std::string& service_type,
41 extensions::EventListenerMap::ListenerList* listener_list) { 42 extensions::EventListenerMap::ListenerList* listener_list) {
42 scoped_ptr<base::DictionaryValue> filter(new base::DictionaryValue); 43 scoped_ptr<base::DictionaryValue> filter(new base::DictionaryValue);
43 filter->SetString(kEventFilterServiceTypeKey, service_type); 44 filter->SetString(kEventFilterServiceTypeKey, service_type);
44 listener_list->push_back(make_linked_ptr( 45 listener_list->push_back(make_linked_ptr(
45 EventListener::ForExtension(kEventFilterServiceTypeKey, extension_id, 46 EventListener::ForExtension(kEventFilterServiceTypeKey, extension_id,
46 nullptr, filter.Pass()).release())); 47 nullptr, std::move(filter))
48 .release()));
47 } 49 }
48 50
49 class NullDelegate : public EventListenerMap::Delegate { 51 class NullDelegate : public EventListenerMap::Delegate {
50 public: 52 public:
51 void OnListenerAdded(const EventListener* listener) override {} 53 void OnListenerAdded(const EventListener* listener) override {}
52 void OnListenerRemoved(const EventListener* listener) override {} 54 void OnListenerRemoved(const EventListener* listener) override {}
53 }; 55 };
54 56
55 // Testing subclass of MDnsAPI which replaces calls to core browser components 57 // Testing subclass of MDnsAPI which replaces calls to core browser components
56 // that we don't want to have to instantiate or mock for these tests. 58 // that we don't want to have to instantiate or mock for these tests.
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 render_process_host(), kExtId, filter, false); 436 render_process_host(), kExtId, filter, false);
435 437
436 EXPECT_CALL(*dns_sd_registry(), UnregisterDnsSdListener("_trex._tcp.local")); 438 EXPECT_CALL(*dns_sd_registry(), UnregisterDnsSdListener("_trex._tcp.local"));
437 EventRouter::Get(browser_context()) 439 EventRouter::Get(browser_context())
438 ->RemoveFilteredEventListener(api::mdns::OnServiceList::kEventName, 440 ->RemoveFilteredEventListener(api::mdns::OnServiceList::kEventName,
439 render_process_host(), kExtId, filter, 441 render_process_host(), kExtId, filter,
440 false); 442 false);
441 } 443 }
442 444
443 } // namespace extensions 445 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/mdns/mdns_api.cc ('k') | chrome/browser/extensions/api/mdns/mdns_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698