Remove explicit singletonness of ArcBridgeService part 5.

components/arc/arc_bridge_service_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/arc/arc_bridge_service_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/sequenced_task_runner.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 
 namespace arc {
-
-extern ArcBridgeService* g_arc_bridge_service;
-
 namespace {
 constexpr int64_t kReconnectDelayInSeconds = 5;

[hidehiko, 2016/12/08 15:43:17]

FYI/Off-topic: soon, I'll work on refactoring reconnect code to move it to the
ArcSessionManager. Let's use constexpr base::TimeDelta in the CL.

[Luis Héctor Chávez, 2016/12/08 17:38:25]

sgtm, I wrote this before I realized base::TimeDelta was constexpr-able.

 }  // namespace
 
 ArcBridgeServiceImpl::ArcBridgeServiceImpl(
     const scoped_refptr<base::TaskRunner>& blocking_task_runner)
     : session_started_(false),
       factory_(base::Bind(ArcSession::Create, this, blocking_task_runner)),
-      weak_factory_(this) {
-  DCHECK(!g_arc_bridge_service);
-  g_arc_bridge_service = this;
-}
+      weak_factory_(this) {}
 
 ArcBridgeServiceImpl::~ArcBridgeServiceImpl() {
   if (arc_session_)
     arc_session_->RemoveObserver(this);
-
-  DCHECK(g_arc_bridge_service == this);
-  g_arc_bridge_service = nullptr;
 }
 
 void ArcBridgeServiceImpl::RequestStart() {
   DCHECK(CalledOnValidThread());
   if (session_started_)
     return;
   VLOG(1) << "Session started";
   session_started_ = true;
   PrerequisitesChanged();
 }
@@ skipping 108 matching lines @@
                                 weak_factory_.GetWeakPtr()),
           base::TimeDelta::FromSeconds(kReconnectDelayInSeconds));
     } else {
       // Restart immediately.
       PrerequisitesChanged();
     }
   }
 }
 
 }  // namespace arc