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

Side by Side Diff: chrome/browser/extensions/api/dial/dial_registry_unittest.cc

Issue 697953002: ObserverList::HasObserver now takes a const pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile errors (ChromeOS unit tests). Created 6 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "chrome/browser/extensions/api/dial/dial_device_data.h" 7 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
8 #include "chrome/browser/extensions/api/dial/dial_registry.h" 8 #include "chrome/browser/extensions/api/dial/dial_registry.h"
9 #include "chrome/browser/extensions/api/dial/dial_service.h" 9 #include "chrome/browser/extensions/api/dial/dial_service.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
(...skipping 17 matching lines...) Expand all
28 MOCK_METHOD1(OnDialError, void(DialRegistry::DialErrorCode type)); 28 MOCK_METHOD1(OnDialError, void(DialRegistry::DialErrorCode type));
29 }; 29 };
30 30
31 class MockDialService : public DialService { 31 class MockDialService : public DialService {
32 public: 32 public:
33 virtual ~MockDialService() {} 33 virtual ~MockDialService() {}
34 34
35 MOCK_METHOD0(Discover, bool()); 35 MOCK_METHOD0(Discover, bool());
36 MOCK_METHOD1(AddObserver, void(DialService::Observer*)); 36 MOCK_METHOD1(AddObserver, void(DialService::Observer*));
37 MOCK_METHOD1(RemoveObserver, void(DialService::Observer*)); 37 MOCK_METHOD1(RemoveObserver, void(DialService::Observer*));
38 MOCK_METHOD1(HasObserver, bool(DialService::Observer*)); 38 MOCK_CONST_METHOD1(HasObserver, bool(const DialService::Observer*));
39 }; 39 };
40 40
41 class MockDialRegistry : public DialRegistry { 41 class MockDialRegistry : public DialRegistry {
42 public: 42 public:
43 MockDialRegistry(Observer *dial_api, 43 MockDialRegistry(Observer *dial_api,
44 const base::TimeDelta& refresh_interval, 44 const base::TimeDelta& refresh_interval,
45 const base::TimeDelta& expiration, 45 const base::TimeDelta& expiration,
46 const size_t max_devices) 46 const size_t max_devices)
47 : DialRegistry(dial_api, refresh_interval, expiration, max_devices) { 47 : DialRegistry(dial_api, refresh_interval, expiration, max_devices) {
48 time_ = Time::Now(); 48 time_ = Time::Now();
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_ETHERNET); 353 registry_->OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
354 354
355 registry_->OnDiscoveryRequest(NULL); 355 registry_->OnDiscoveryRequest(NULL);
356 registry_->OnDeviceDiscovered(NULL, third_device_); 356 registry_->OnDeviceDiscovered(NULL, third_device_);
357 registry_->OnDiscoveryFinished(NULL); 357 registry_->OnDiscoveryFinished(NULL);
358 358
359 registry_->OnListenerRemoved(); 359 registry_->OnListenerRemoved();
360 } 360 }
361 361
362 } // namespace extensions 362 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chrome/browser/extensions/api/dial/dial_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698