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

Unified Diff: chrome/browser/devtools/device/android_device_manager.h

Issue 2913693002: Replace deprecated base::NonThreadSafe in chrome/browser/devtools in favor of SequenceChecker. (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/android_device_manager.h
diff --git a/chrome/browser/devtools/device/android_device_manager.h b/chrome/browser/devtools/device/android_device_manager.h
index 0838c1d788bb6f742b26a7f88b15fc60a24ad515..61e33b03ca07924ea08a2b43f67dc92487d1f37d 100644
--- a/chrome/browser/devtools/device/android_device_manager.h
+++ b/chrome/browser/devtools/device/android_device_manager.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/sequence_checker.h"
#include "base/single_thread_task_runner.h"
-#include "base/threading/non_thread_safe.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/browser_thread.h"
#include "ui/gfx/geometry/size.h"
@@ -20,7 +20,7 @@ namespace net {
class StreamSocket;
}
-class AndroidDeviceManager : public base::NonThreadSafe {
+class AndroidDeviceManager {
public:
using CommandCallback =
base::Callback<void(int, const std::string&)>;
@@ -107,8 +107,7 @@ class AndroidDeviceManager : public base::NonThreadSafe {
class DeviceProvider;
- class Device : public base::RefCountedThreadSafe<Device>,
- public base::NonThreadSafe {
+ class Device : public base::RefCountedThreadSafe<Device> {
public:
void QueryDeviceInfo(const DeviceInfoCallback& callback);
@@ -144,6 +143,9 @@ class AndroidDeviceManager : public base::NonThreadSafe {
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
scoped_refptr<DeviceProvider> provider_;
std::string serial_;
+
+ SEQUENCE_CHECKER(sequence_checker_);
+
base::WeakPtrFactory<Device> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(Device);
@@ -243,6 +245,8 @@ class AndroidDeviceManager : public base::NonThreadSafe {
DeviceProviders providers_;
DeviceWeakMap devices_;
+ SEQUENCE_CHECKER(sequence_checker_);
+
base::WeakPtrFactory<AndroidDeviceManager> weak_factory_;
};
« no previous file with comments | « chrome/browser/devtools/device/adb/mock_adb_server.cc ('k') | chrome/browser/devtools/device/android_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698