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

Side by Side Diff: chrome/browser/devtools/device/android_device_manager.cc

Issue 2913693002: Replace deprecated base::NonThreadSafe in chrome/browser/devtools in favor of SequenceChecker. (Closed)
Patch Set: Created 3 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/devtools/device/android_device_manager.h" 5 #include "chrome/browser/devtools/device/android_device_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner, 450 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner,
451 scoped_refptr<DeviceProvider> provider, 451 scoped_refptr<DeviceProvider> provider,
452 const std::string& serial) 452 const std::string& serial)
453 : task_runner_(device_task_runner), 453 : task_runner_(device_task_runner),
454 provider_(provider), 454 provider_(provider),
455 serial_(serial), 455 serial_(serial),
456 weak_factory_(this) { 456 weak_factory_(this) {
457 } 457 }
458 458
459 AndroidDeviceManager::Device::~Device() { 459 AndroidDeviceManager::Device::~Device() {
460 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
460 provider_->AddRef(); 461 provider_->AddRef();
461 DeviceProvider* raw_ptr = provider_.get(); 462 DeviceProvider* raw_ptr = provider_.get();
462 provider_ = nullptr; 463 provider_ = nullptr;
463 task_runner_->PostTask(FROM_HERE, 464 task_runner_->PostTask(FROM_HERE,
464 base::BindOnce(&ReleaseDeviceAndProvider, 465 base::BindOnce(&ReleaseDeviceAndProvider,
465 base::Unretained(raw_ptr), serial_)); 466 base::Unretained(raw_ptr), serial_));
466 } 467 }
467 468
468 AndroidDeviceManager::HandlerThread* 469 AndroidDeviceManager::HandlerThread*
469 AndroidDeviceManager::HandlerThread::instance_ = nullptr; 470 AndroidDeviceManager::HandlerThread::instance_ = nullptr;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 base::Bind(&AndroidDeviceManager::UpdateDevices, 535 base::Bind(&AndroidDeviceManager::UpdateDevices,
535 weak_factory_.GetWeakPtr(), callback)); 536 weak_factory_.GetWeakPtr(), callback));
536 } 537 }
537 538
538 AndroidDeviceManager::AndroidDeviceManager() 539 AndroidDeviceManager::AndroidDeviceManager()
539 : handler_thread_(HandlerThread::GetInstance()), 540 : handler_thread_(HandlerThread::GetInstance()),
540 weak_factory_(this) { 541 weak_factory_(this) {
541 } 542 }
542 543
543 AndroidDeviceManager::~AndroidDeviceManager() { 544 AndroidDeviceManager::~AndroidDeviceManager() {
545 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
544 SetDeviceProviders(DeviceProviders()); 546 SetDeviceProviders(DeviceProviders());
545 } 547 }
546 548
547 void AndroidDeviceManager::UpdateDevices( 549 void AndroidDeviceManager::UpdateDevices(
548 const DevicesCallback& callback, 550 const DevicesCallback& callback,
549 std::unique_ptr<DeviceDescriptors> descriptors) { 551 std::unique_ptr<DeviceDescriptors> descriptors) {
550 Devices response; 552 Devices response;
551 DeviceWeakMap new_devices; 553 DeviceWeakMap new_devices;
552 for (DeviceDescriptors::const_iterator it = descriptors->begin(); 554 for (DeviceDescriptors::const_iterator it = descriptors->begin();
553 it != descriptors->end(); 555 it != descriptors->end();
554 ++it) { 556 ++it) {
555 DeviceWeakMap::iterator found = devices_.find(it->serial); 557 DeviceWeakMap::iterator found = devices_.find(it->serial);
556 scoped_refptr<Device> device; 558 scoped_refptr<Device> device;
557 if (found == devices_.end() || !found->second || 559 if (found == devices_.end() || !found->second ||
558 found->second->provider_.get() != it->provider.get()) { 560 found->second->provider_.get() != it->provider.get()) {
559 device = 561 device =
560 new Device(handler_thread_->message_loop(), it->provider, it->serial); 562 new Device(handler_thread_->message_loop(), it->provider, it->serial);
561 } else { 563 } else {
562 device = found->second.get(); 564 device = found->second.get();
563 } 565 }
564 response.push_back(device); 566 response.push_back(device);
565 new_devices[it->serial] = device->weak_factory_.GetWeakPtr(); 567 new_devices[it->serial] = device->weak_factory_.GetWeakPtr();
566 } 568 }
567 devices_.swap(new_devices); 569 devices_.swap(new_devices);
568 callback.Run(response); 570 callback.Run(response);
569 } 571 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/android_device_manager.h ('k') | chrome/browser/devtools/device/port_forwarding_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698