Index: services/resource_coordinator/memory/coordinator/coordinator_impl.h |
diff --git a/services/resource_coordinator/memory/coordinator/coordinator_impl.h b/services/resource_coordinator/memory/coordinator/coordinator_impl.h |
index 80ce6aee23efcad2ee470e69f654ec0a09ca1e77..907974f4e6a606669637a35a9b7a32787fe161c2 100644 |
--- a/services/resource_coordinator/memory/coordinator/coordinator_impl.h |
+++ b/services/resource_coordinator/memory/coordinator/coordinator_impl.h |
@@ -11,7 +11,7 @@ |
#include "base/lazy_instance.h" |
#include "base/memory/ref_counted.h" |
-#include "base/threading/thread_checker.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/trace_event/memory_dump_request_args.h" |
#include "mojo/public/cpp/bindings/binding.h" |
#include "mojo/public/cpp/bindings/binding_set.h" |
@@ -22,13 +22,15 @@ namespace memory_instrumentation { |
class CoordinatorImpl : public Coordinator, public mojom::Coordinator { |
public: |
+ static void Create(scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
static CoordinatorImpl* GetInstance(); |
// Coordinator |
void BindCoordinatorRequest(mojom::CoordinatorRequest) override; |
private: |
- friend class CoordinatorImplTest; // For testing |
+ friend std::default_delete<CoordinatorImpl>; // For testing |
+ friend class CoordinatorImplTest; // For testing |
friend struct base::DefaultLazyInstanceTraits<CoordinatorImpl>; |
struct QueuedMemoryDumpRequest { |
@@ -42,6 +44,10 @@ class CoordinatorImpl : public Coordinator, public mojom::Coordinator { |
CoordinatorImpl(); |
~CoordinatorImpl() override; |
+ void Initialize(scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
+ void InitializeForTest( |
Primiano Tucci (use gerrit)
2017/03/08 12:05:43
nit: +"ing", I think the standard pattern is "ForT
chiniforooshan
2017/03/08 19:03:43
Done.
|
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
+ |
// mojom::Coordinator |
void RegisterProcessLocalDumpManager( |
mojom::ProcessLocalDumpManagerPtr process_manager) override; |
@@ -78,7 +84,7 @@ class CoordinatorImpl : public Coordinator, public mojom::Coordinator { |
int failed_memory_dump_count_; |
std::list<QueuedMemoryDumpRequest> queued_memory_dump_requests_; |
- base::ThreadChecker thread_checker_; |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
Primiano Tucci (use gerrit)
2017/03/08 12:05:43
why are you changing this? Looks like you are usin
chiniforooshan
2017/03/08 19:03:43
Done.
|
DISALLOW_COPY_AND_ASSIGN(CoordinatorImpl); |
}; |