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

Side by Side Diff: device/bluetooth/bluetooth_adapter_factory_wrapper.cc

Issue 2059543002: bluetooth: Move FactoryWrapper to device and expose a function for testing in chooser controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Remove code from client interface Created 4 years, 5 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter_factory_wrapper.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h" 5 #include "device/bluetooth/bluetooth_adapter_factory_wrapper.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h"
12 #include "base/location.h"
11 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
12 #include "base/time/time.h"
13 #include "content/public/browser/browser_thread.h"
14 #include "device/bluetooth/bluetooth_adapter_factory.h" 14 #include "device/bluetooth/bluetooth_adapter_factory.h"
15 15
16 using device::BluetoothAdapter; 16 namespace {
17 using device::BluetoothAdapterFactory;
18 17
19 namespace { 18 static base::LazyInstance<device::BluetoothAdapterFactoryWrapper>::Leaky
20 // TODO(ortuno): Once we have a chooser for scanning and a way to control that 19 g_singleton = LAZY_INSTANCE_INITIALIZER;
21 // chooser from tests we should delete this constant. 20
22 // https://crbug.com/436280
23 enum { kTestingScanDuration = 0 }; // No need to wait when testing.
24 enum { kScanDuration = 10 };
25 } // namespace 21 } // namespace
26 22
27 namespace content { 23 namespace device {
28
29 BluetoothAdapterFactoryWrapper::BluetoothAdapterFactoryWrapper()
30 : scan_duration_(base::TimeDelta::FromSecondsD(kScanDuration)),
31 testing_(false),
32 weak_ptr_factory_(this) {
33 DCHECK_CURRENTLY_ON(BrowserThread::UI);
34 }
35 24
36 BluetoothAdapterFactoryWrapper::~BluetoothAdapterFactoryWrapper() { 25 BluetoothAdapterFactoryWrapper::~BluetoothAdapterFactoryWrapper() {
37 DCHECK_CURRENTLY_ON(BrowserThread::UI); 26 DCHECK(thread_checker_.CalledOnValidThread());
38 // All observers should have been removed already. 27 // All observers should have been removed already.
39 DCHECK(adapter_observers_.empty()); 28 DCHECK(adapter_observers_.empty());
40 // Clear adapter. 29 // Clear adapter.
41 set_adapter(scoped_refptr<device::BluetoothAdapter>()); 30 set_adapter(scoped_refptr<BluetoothAdapter>());
31 }
32
33 // static
34 BluetoothAdapterFactoryWrapper& BluetoothAdapterFactoryWrapper::Get() {
35 return g_singleton.Get();
42 } 36 }
43 37
44 bool BluetoothAdapterFactoryWrapper::IsBluetoothAdapterAvailable() { 38 bool BluetoothAdapterFactoryWrapper::IsBluetoothAdapterAvailable() {
45 DCHECK_CURRENTLY_ON(BrowserThread::UI); 39 DCHECK(thread_checker_.CalledOnValidThread());
46 return BluetoothAdapterFactory::IsBluetoothAdapterAvailable() || testing_; 40 return BluetoothAdapterFactory::IsBluetoothAdapterAvailable();
47 } 41 }
48 42
49 void BluetoothAdapterFactoryWrapper::AcquireAdapter( 43 void BluetoothAdapterFactoryWrapper::AcquireAdapter(
50 device::BluetoothAdapter::Observer* observer, 44 BluetoothAdapter::Observer* observer,
51 const AcquireAdapterCallback& callback) { 45 const AcquireAdapterCallback& callback) {
52 DCHECK_CURRENTLY_ON(BrowserThread::UI); 46 DCHECK(thread_checker_.CalledOnValidThread());
53 DCHECK(!GetAdapter(observer)); 47 DCHECK(!GetAdapter(observer));
54 48
55 AddAdapterObserver(observer); 49 AddAdapterObserver(observer);
56 if (adapter_.get()) { 50 if (adapter_.get()) {
57 base::ThreadTaskRunnerHandle::Get()->PostTask( 51 base::ThreadTaskRunnerHandle::Get()->PostTask(
58 FROM_HERE, base::Bind(callback, base::Unretained(adapter_.get()))); 52 FROM_HERE, base::Bind(callback, base::Unretained(adapter_.get())));
59 return; 53 return;
60 } 54 }
61 55
62 DCHECK(BluetoothAdapterFactory::IsBluetoothAdapterAvailable()); 56 DCHECK(BluetoothAdapterFactory::IsBluetoothAdapterAvailable());
63 BluetoothAdapterFactory::GetAdapter( 57 BluetoothAdapterFactory::GetAdapter(
64 base::Bind(&BluetoothAdapterFactoryWrapper::OnGetAdapter, 58 base::Bind(&BluetoothAdapterFactoryWrapper::OnGetAdapter,
65 weak_ptr_factory_.GetWeakPtr(), callback)); 59 weak_ptr_factory_.GetWeakPtr(), callback));
66 } 60 }
67 61
68 void BluetoothAdapterFactoryWrapper::ReleaseAdapter( 62 void BluetoothAdapterFactoryWrapper::ReleaseAdapter(
69 device::BluetoothAdapter::Observer* observer) { 63 BluetoothAdapter::Observer* observer) {
70 DCHECK_CURRENTLY_ON(BrowserThread::UI); 64 DCHECK(thread_checker_.CalledOnValidThread());
71 if (!HasAdapter(observer)) { 65 if (!HasAdapter(observer)) {
72 return; 66 return;
73 } 67 }
74 RemoveAdapterObserver(observer); 68 RemoveAdapterObserver(observer);
75 if (adapter_observers_.empty()) 69 if (adapter_observers_.empty())
76 set_adapter(scoped_refptr<device::BluetoothAdapter>()); 70 set_adapter(scoped_refptr<BluetoothAdapter>());
77 } 71 }
78 72
79 BluetoothAdapter* BluetoothAdapterFactoryWrapper::GetAdapter( 73 BluetoothAdapter* BluetoothAdapterFactoryWrapper::GetAdapter(
80 device::BluetoothAdapter::Observer* observer) { 74 BluetoothAdapter::Observer* observer) {
81 DCHECK_CURRENTLY_ON(BrowserThread::UI); 75 DCHECK(thread_checker_.CalledOnValidThread());
82 if (HasAdapter(observer)) { 76 if (HasAdapter(observer)) {
83 return adapter_.get(); 77 return adapter_.get();
84 } 78 }
85 return nullptr; 79 return nullptr;
86 } 80 }
87 81
88 void BluetoothAdapterFactoryWrapper::SetBluetoothAdapterForTesting( 82 void BluetoothAdapterFactoryWrapper::SetBluetoothAdapterForTesting(
89 scoped_refptr<device::BluetoothAdapter> mock_adapter) { 83 scoped_refptr<BluetoothAdapter> mock_adapter) {
90 DCHECK_CURRENTLY_ON(BrowserThread::UI); 84 DCHECK(thread_checker_.CalledOnValidThread());
91 scan_duration_ = base::TimeDelta::FromSecondsD(kTestingScanDuration);
92 testing_ = true;
93 set_adapter(std::move(mock_adapter)); 85 set_adapter(std::move(mock_adapter));
94 } 86 }
95 87
88 BluetoothAdapterFactoryWrapper::BluetoothAdapterFactoryWrapper()
89 : weak_ptr_factory_(this) {
90 DCHECK(thread_checker_.CalledOnValidThread());
91 }
92
96 void BluetoothAdapterFactoryWrapper::OnGetAdapter( 93 void BluetoothAdapterFactoryWrapper::OnGetAdapter(
97 const AcquireAdapterCallback& continuation, 94 const AcquireAdapterCallback& continuation,
98 scoped_refptr<device::BluetoothAdapter> adapter) { 95 scoped_refptr<BluetoothAdapter> adapter) {
99 DCHECK_CURRENTLY_ON(BrowserThread::UI); 96 DCHECK(thread_checker_.CalledOnValidThread());
97
100 set_adapter(adapter); 98 set_adapter(adapter);
101 continuation.Run(adapter_.get()); 99 continuation.Run(adapter_.get());
102 } 100 }
103 101
104 bool BluetoothAdapterFactoryWrapper::HasAdapter( 102 bool BluetoothAdapterFactoryWrapper::HasAdapter(
105 device::BluetoothAdapter::Observer* observer) { 103 BluetoothAdapter::Observer* observer) {
106 DCHECK_CURRENTLY_ON(BrowserThread::UI); 104 DCHECK(thread_checker_.CalledOnValidThread());
105
107 return ContainsKey(adapter_observers_, observer); 106 return ContainsKey(adapter_observers_, observer);
108 } 107 }
109 108
110 void BluetoothAdapterFactoryWrapper::AddAdapterObserver( 109 void BluetoothAdapterFactoryWrapper::AddAdapterObserver(
111 device::BluetoothAdapter::Observer* observer) { 110 BluetoothAdapter::Observer* observer) {
112 DCHECK_CURRENTLY_ON(BrowserThread::UI); 111 DCHECK(thread_checker_.CalledOnValidThread());
112
113 auto iter = adapter_observers_.insert(observer); 113 auto iter = adapter_observers_.insert(observer);
114 DCHECK(iter.second); 114 DCHECK(iter.second);
115 if (adapter_) { 115 if (adapter_) {
116 adapter_->AddObserver(observer); 116 adapter_->AddObserver(observer);
117 } 117 }
118 } 118 }
119 119
120 void BluetoothAdapterFactoryWrapper::RemoveAdapterObserver( 120 void BluetoothAdapterFactoryWrapper::RemoveAdapterObserver(
121 device::BluetoothAdapter::Observer* observer) { 121 BluetoothAdapter::Observer* observer) {
122 DCHECK_CURRENTLY_ON(BrowserThread::UI); 122 DCHECK(thread_checker_.CalledOnValidThread());
123
123 size_t removed = adapter_observers_.erase(observer); 124 size_t removed = adapter_observers_.erase(observer);
124 DCHECK(removed); 125 DCHECK(removed);
125 if (adapter_) { 126 if (adapter_) {
126 adapter_->RemoveObserver(observer); 127 adapter_->RemoveObserver(observer);
127 } 128 }
128 } 129 }
129 130
130 void BluetoothAdapterFactoryWrapper::set_adapter( 131 void BluetoothAdapterFactoryWrapper::set_adapter(
131 scoped_refptr<device::BluetoothAdapter> adapter) { 132 scoped_refptr<BluetoothAdapter> adapter) {
132 DCHECK_CURRENTLY_ON(BrowserThread::UI); 133 DCHECK(thread_checker_.CalledOnValidThread());
134
133 if (adapter_.get()) { 135 if (adapter_.get()) {
134 for (device::BluetoothAdapter::Observer* observer : adapter_observers_) { 136 for (BluetoothAdapter::Observer* observer : adapter_observers_) {
135 adapter_->RemoveObserver(observer); 137 adapter_->RemoveObserver(observer);
136 } 138 }
137 } 139 }
138 adapter_ = adapter; 140 adapter_ = adapter;
139 if (adapter_.get()) { 141 if (adapter_.get()) {
140 for (device::BluetoothAdapter::Observer* observer : adapter_observers_) { 142 for (BluetoothAdapter::Observer* observer : adapter_observers_) {
141 adapter_->AddObserver(observer); 143 adapter_->AddObserver(observer);
142 } 144 }
143 } 145 }
144 } 146 }
145 147
146 } // namespace content 148 } // namespace device
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_adapter_factory_wrapper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698