Fix ArcBridgeBootstrap race issues.

components/arc/arc_bridge_service.h

Index: components/arc/arc_bridge_service.h
diff --git a/components/arc/arc_bridge_service.h b/components/arc/arc_bridge_service.h
index df3815595600f5b1da303c37b5de10db61050754..fae18afa0589f9337a902e6b5736d7e5948acba8 100644
--- a/components/arc/arc_bridge_service.h
+++ b/components/arc/arc_bridge_service.h
@@ -8,11 +8,8 @@
 #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"
 
@@ -125,6 +122,7 @@ class ArcBridgeService {
   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:
   //
@@ -200,13 +198,6 @@ class ArcBridgeService {
   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_;