arc-bridge: Enable ARC with a command-line flag

components/arc/arc_bridge_service.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.h"
 
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/arc/common/arc_host_messages.h"
 #include "components/arc/common/arc_instance_messages.h"
 #include "ipc/ipc_channel.h"
 
 namespace arc {
 
 namespace {
@@ skipping 27 matching lines @@
   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
+bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) {
+  return command_line->HasSwitch(chromeos::switches::kEnableArc);
+}
+
 void ArcBridgeService::DetectAvailability() {
   chromeos::SessionManagerClient* session_manager_client =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager_client->CheckArcAvailability(base::Bind(
       &ArcBridgeService::OnArcAvailable, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::HandleStartup() {
   DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
   session_started_ = true;
@@ skipping 156 matching lines @@
   }
   if (!success) {
     LOG(ERROR) << "ARC instance unable to start. Shutting down the bridge";
     StopInstance();
     return;
   }
 }
 
 void ArcBridgeService::OnInstanceBootPhase(InstanceBootPhase phase) {
   DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
-  if (state_ != State::STARTING) {
+  // The state can be STARTING the first time this is called, and will then
+  // transition to READY after BRIDGE_READY has been passed.
+  if (state_ != State::STARTING && state_ != State::READY) {

[elijahtaylor (use chromium), 2015/11/23 18:01:04]

this doesn't seem related to the flag, what is this for?

[Luis Héctor Chávez, 2015/11/23 18:02:45]

This is a fix for a test breakage that we did not notice since it was not being
tested :(

     VLOG(1) << "StopInstance() called while connecting";
     return;
   }
   if (phase == InstanceBootPhase::BRIDGE_READY) {
     SetState(State::READY);
   }
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInstanceBootPhase(phase));
 }
 
 void ArcBridgeService::SetState(State state) {
@@ skipping 31 matching lines @@
 void ArcBridgeService::OnInstanceStopped(bool success) {
   DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
   // STOPPING is the only valid state for this function.
   // DCHECK on enum classes not supported.
   DCHECK(state_ == State::STOPPING);
   ipc_channel_.reset();
   SetState(State::STOPPED);
 }
 
 }  // namespace arc