Index: components/arc/arc_bridge_service.cc |
diff --git a/components/arc/arc_bridge_service.cc b/components/arc/arc_bridge_service.cc |
index 39072fd71c834083bfb9f18fb5995ac8df04a350..0e00e5a001801d4ce6c372b2d9307102c2e1f76a 100644 |
--- a/components/arc/arc_bridge_service.cc |
+++ b/components/arc/arc_bridge_service.cc |
@@ -12,34 +12,14 @@ |
namespace arc { |
-namespace { |
- |
-// Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
-ArcBridgeService* g_arc_bridge_service = nullptr; |
- |
-} // namespace |
- |
ArcBridgeService::ArcBridgeService() |
: origin_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
available_(false), |
- state_(State::STOPPED) { |
- DCHECK(!g_arc_bridge_service); |
- g_arc_bridge_service = this; |
-} |
+ state_(State::STOPPED) {} |
ArcBridgeService::~ArcBridgeService() { |
DCHECK(origin_task_runner()->RunsTasksOnCurrentThread()); |
DCHECK(state() == State::STOPPING || state() == State::STOPPED); |
- DCHECK(g_arc_bridge_service == this); |
- g_arc_bridge_service = nullptr; |
-} |
- |
-// static |
-ArcBridgeService* ArcBridgeService::Get() { |
- DCHECK(g_arc_bridge_service); |
- DCHECK(g_arc_bridge_service->origin_task_runner()-> |
- RunsTasksOnCurrentThread()); |
- return g_arc_bridge_service; |
} |
// static |
@@ -93,12 +73,4 @@ void ArcBridgeService::SetAvailable(bool available) { |
FOR_EACH_OBSERVER(Observer, observer_list(), OnAvailableChanged(available_)); |
} |
-// static |
-scoped_ptr<ArcBridgeService> ArcBridgeService::Create( |
- const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner, |
- const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { |
- return make_scoped_ptr(new ArcBridgeServiceImpl(ipc_task_runner, |
- file_task_runner)); |
-} |
- |
} // namespace arc |