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

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

Issue 2294653002: Some linked_ptr -> unique_ptr conversion in extensions/browser. (Closed)
Patch Set: nullptr Created 4 years, 3 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" 5 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/memory/linked_ptr.h"
14 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
15 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_service_test_base.h" 15 #include "chrome/browser/extensions/extension_service_test_base.h"
17 #include "chrome/browser/extensions/test_extension_system.h" 16 #include "chrome/browser/extensions/test_extension_system.h"
18 #include "chrome/common/extensions/api/mdns.h" 17 #include "chrome/common/extensions/api/mdns.h"
19 #include "content/public/browser/browser_context.h" 18 #include "content/public/browser/browser_context.h"
20 #include "content/public/test/mock_render_process_host.h" 19 #include "content/public/test/mock_render_process_host.h"
21 #include "extensions/browser/event_listener_map.h" 20 #include "extensions/browser/event_listener_map.h"
22 #include "extensions/browser/event_router_factory.h" 21 #include "extensions/browser/event_router_factory.h"
23 #include "extensions/browser/extension_prefs.h" 22 #include "extensions/browser/extension_prefs.h"
(...skipping 13 matching lines...) Expand all
37 const char kService1[] = "service1"; 36 const char kService1[] = "service1";
38 const char kService2[] = "service2"; 37 const char kService2[] = "service2";
39 38
40 // Registers a new EventListener for |service_types| in |listener_list|. 39 // Registers a new EventListener for |service_types| in |listener_list|.
41 void AddEventListener( 40 void AddEventListener(
42 const std::string& extension_id, 41 const std::string& extension_id,
43 const std::string& service_type, 42 const std::string& service_type,
44 extensions::EventListenerMap::ListenerList* listener_list) { 43 extensions::EventListenerMap::ListenerList* listener_list) {
45 std::unique_ptr<base::DictionaryValue> filter(new base::DictionaryValue); 44 std::unique_ptr<base::DictionaryValue> filter(new base::DictionaryValue);
46 filter->SetString(kEventFilterServiceTypeKey, service_type); 45 filter->SetString(kEventFilterServiceTypeKey, service_type);
47 listener_list->push_back(make_linked_ptr( 46 listener_list->push_back(base::WrapUnique(
48 EventListener::ForExtension(kEventFilterServiceTypeKey, extension_id, 47 EventListener::ForExtension(kEventFilterServiceTypeKey, extension_id,
49 nullptr, std::move(filter)) 48 nullptr, std::move(filter))
50 .release())); 49 .release()));
Devlin 2016/08/30 19:21:53 EventListener::ForExtension() returns a unique_ptr
lazyboy 2016/08/30 20:30:56 Done.
51 } 50 }
52 51
53 class NullDelegate : public EventListenerMap::Delegate { 52 class NullDelegate : public EventListenerMap::Delegate {
54 public: 53 public:
55 void OnListenerAdded(const EventListener* listener) override {} 54 void OnListenerAdded(const EventListener* listener) override {}
56 void OnListenerRemoved(const EventListener* listener) override {} 55 void OnListenerRemoved(const EventListener* listener) override {}
57 }; 56 };
58 57
59 // Testing subclass of MDnsAPI which replaces calls to core browser components 58 // Testing subclass of MDnsAPI which replaces calls to core browser components
60 // that we don't want to have to instantiate or mock for these tests. 59 // that we don't want to have to instantiate or mock for these tests.
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 render_process_host(), kExtId, filter, false); 438 render_process_host(), kExtId, filter, false);
440 439
441 EXPECT_CALL(*dns_sd_registry(), UnregisterDnsSdListener("_trex._tcp.local")); 440 EXPECT_CALL(*dns_sd_registry(), UnregisterDnsSdListener("_trex._tcp.local"));
442 EventRouter::Get(browser_context()) 441 EventRouter::Get(browser_context())
443 ->RemoveFilteredEventListener(api::mdns::OnServiceList::kEventName, 442 ->RemoveFilteredEventListener(api::mdns::OnServiceList::kEventName,
444 render_process_host(), kExtId, filter, 443 render_process_host(), kExtId, filter,
445 false); 444 false);
446 } 445 }
447 446
448 } // namespace extensions 447 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698