arc: Add the --arc-available switch

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 <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 31 matching lines @@
     LOG(ERROR) << "ArcBridgeService is not ready.";
     return nullptr;
   }
   DCHECK(g_arc_bridge_service->CalledOnValidThread());
   return g_arc_bridge_service;
 }
 
 // static
 bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) {
   return command_line->HasSwitch(chromeos::switches::kEnableArc) ||
-         base::FeatureList::IsEnabled(kArcEnabledFeature);
+         (command_line->HasSwitch(chromeos::switches::kArcAvailable) &&
+          base::FeatureList::IsEnabled(kArcEnabledFeature));
 }
 
 void ArcBridgeService::AddObserver(Observer* observer) {
   DCHECK(CalledOnValidThread());
   observer_list_.AddObserver(observer);
 }
 
 void ArcBridgeService::RemoveObserver(Observer* observer) {
   DCHECK(CalledOnValidThread());
   observer_list_.RemoveObserver(observer);
@@ skipping 13 matching lines @@
 void ArcBridgeService::SetStopReason(StopReason stop_reason) {
   DCHECK(CalledOnValidThread());
   stop_reason_ = stop_reason;
 }
 
 bool ArcBridgeService::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc