Fix ArcBridgeBootstrap race issues.

components/arc/arc_bridge_service.h

 // 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.
 
 #ifndef COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 
 #include <string>
 #include <vector>
 
-#include "base/files/scoped_file.h"
-#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "base/values.h"
 #include "components/arc/common/arc_bridge.mojom.h"
 #include "components/arc/instance_holder.h"
 
 namespace base {
 class CommandLine;
 }  // namespace base
 
 namespace arc {
 
 class ArcBridgeTest;
@@ skipping 92 matching lines @@
   InstanceHolder<mojom::VideoInstance>* video() { return &video_; }
 
   // Gets if ARC is currently running.
   bool ready() const { return state() == State::READY; }
 
   // Gets if ARC is currently stopped. This is not exactly !ready() since there
   // are transient states between ready() and stopped().
   bool stopped() const { return state() == State::STOPPED; }
 
  protected:
+  // TODO(hidehiko): This state is obsolete. Clean this up.
   // The possible states of the bridge.  In the normal flow, the state changes
   // in the following sequence:
   //
   // STOPPED
   //   PrerequisitesChanged() ->
   // CONNECTING
   //   OnConnectionEstablished() ->
   // READY
   //
   // The ArcBridgeBootstrap state machine can be thought of being substates of
@@ skipping 55 matching lines @@
   // Sets the reason the bridge is stopped. This function must be always called
   // before SetState(State::STOPPED) to report a correct reason with
   // Observer::OnBridgeStopped().
   void SetStopReason(StopReason stop_reason);
 
   base::ObserverList<Observer>& observer_list() { return observer_list_; }
 
   bool CalledOnValidThread();
 
  private:
-  friend class ArcBridgeTest;
-  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Basic);
-  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites);
-  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
-  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
-  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, OnBridgeStopped);
-
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;
 
   // The current state of the bridge.
   ArcBridgeService::State state_;
 
   // The reason the bridge is stopped.
   StopReason stop_reason_;
 
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_