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

Side by Side Diff: tools/android/forwarder2/device_controller.cc

Issue 2881383003: Rename TaskRunner::RunsTasksOnCurrentThread() in //android_webview, //tools (Closed)
Patch Set: add //tools/android Created 3 years, 7 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 (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 "tools/android/forwarder2/device_controller.h" 5 #include "tools/android/forwarder2/device_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 19 matching lines...) Expand all
30 << adb_unix_socket << ": "; 30 << adb_unix_socket << ": ";
31 return device_controller; 31 return device_controller;
32 } 32 }
33 LOG(INFO) << "Listening on Unix Domain Socket " << adb_unix_socket; 33 LOG(INFO) << "Listening on Unix Domain Socket " << adb_unix_socket;
34 device_controller.reset( 34 device_controller.reset(
35 new DeviceController(std::move(host_socket), exit_notifier_fd)); 35 new DeviceController(std::move(host_socket), exit_notifier_fd));
36 return device_controller; 36 return device_controller;
37 } 37 }
38 38
39 DeviceController::~DeviceController() { 39 DeviceController::~DeviceController() {
40 DCHECK(construction_task_runner_->RunsTasksOnCurrentThread()); 40 DCHECK(construction_task_runner_->RunsTasksInCurrentSequence());
41 } 41 }
42 42
43 void DeviceController::Start() { 43 void DeviceController::Start() {
44 AcceptHostCommandSoon(); 44 AcceptHostCommandSoon();
45 } 45 }
46 46
47 DeviceController::DeviceController(std::unique_ptr<Socket> host_socket, 47 DeviceController::DeviceController(std::unique_ptr<Socket> host_socket,
48 int exit_notifier_fd) 48 int exit_notifier_fd)
49 : host_socket_(std::move(host_socket)), 49 : host_socket_(std::move(host_socket)),
50 exit_notifier_fd_(exit_notifier_fd), 50 exit_notifier_fd_(exit_notifier_fd),
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 void DeviceController::DeleteListenerOnError( 138 void DeviceController::DeleteListenerOnError(
139 const base::WeakPtr<DeviceController>& device_controller_ptr, 139 const base::WeakPtr<DeviceController>& device_controller_ptr,
140 std::unique_ptr<DeviceListener> device_listener) { 140 std::unique_ptr<DeviceListener> device_listener) {
141 DeviceListener* const listener = device_listener.release(); 141 DeviceListener* const listener = device_listener.release();
142 DeviceController* const controller = device_controller_ptr.get(); 142 DeviceController* const controller = device_controller_ptr.get();
143 if (!controller) { 143 if (!controller) {
144 // |listener| was already deleted by the controller that did have its 144 // |listener| was already deleted by the controller that did have its
145 // ownership. 145 // ownership.
146 return; 146 return;
147 } 147 }
148 DCHECK(controller->construction_task_runner_->RunsTasksOnCurrentThread()); 148 DCHECK(controller->construction_task_runner_->RunsTasksInCurrentSequence());
149 bool listener_did_exist = DeleteRefCountedValueInMap( 149 bool listener_did_exist = DeleteRefCountedValueInMap(
150 listener->listener_port(), &controller->listeners_); 150 listener->listener_port(), &controller->listeners_);
151 DCHECK(listener_did_exist); 151 DCHECK(listener_did_exist);
152 // Note that |listener| was deleted by DeleteRefCountedValueInMap(). 152 // Note that |listener| was deleted by DeleteRefCountedValueInMap().
153 } 153 }
154 154
155 } // namespace forwarder 155 } // namespace forwarder
OLDNEW
« no previous file with comments | « android_webview/browser/net/aw_cookie_store_wrapper.cc ('k') | tools/android/forwarder2/device_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698