[Presentation API] Media Router: queue PresentationConnectionStateChanged events fired before callb…

chrome/browser/media/router/media_router_base.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 CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 21 matching lines @@
   // This will terminate all incognito media routes.
   void OnIncognitoProfileShutdown() override;
 
  protected:
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
                            PresentationConnectionStateChangedCallback);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
                            PresentationConnectionStateChangedCallbackRemoved);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, CreatePresentationIds);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, NotifyCallbacks);
+  FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest,
+                           NotifyCallbacksPendingStateChange);
 
   MediaRouterBase();
 
   // Generates a unique presentation id. Shared between Android and desktop.
   static std::string CreatePresentationId();
 
   void NotifyPresentationConnectionStateChange(
       const MediaRoute::Id& route_id,
       content::PresentationConnectionState state);
   void NotifyPresentationConnectionClose(
       const MediaRoute::Id& route_id,
       content::PresentationConnectionCloseReason reason,
       const std::string& message);
+  void NotifyPresentationConnectionStateChange(
+      const MediaRoute::Id& route_id,
+      const content::PresentationConnectionStateChangeInfo& info);
 
   // Returns true when there is at least one MediaRoute that can be returned by
   // JoinRoute().
   bool HasJoinableRoute() const;
 
   using PresentationConnectionStateChangedCallbacks = base::CallbackList<void(
       const content::PresentationConnectionStateChangeInfo&)>;
 
   base::ScopedPtrHashMap<
       MediaRoute::Id,
       std::unique_ptr<PresentationConnectionStateChangedCallbacks>>
       presentation_connection_state_callbacks_;
 
+  // Stores ConnectionStateChange events fired before
+  // PresentationConnectionStateChangedCallback is registered.
+  std::map<MediaRoute::Id, content::PresentationConnectionStateChangeInfo>
+      queued_state_changes_;
+
  private:
   friend class MediaRouterFactory;
   friend class MediaRouterMojoTest;
 
   class InternalMediaRoutesObserver;
 
   // Must be called before invoking any other method.
   void Initialize();
 
   // Called when a PresentationConnectionStateChangedCallback associated with
   // |route_id| is removed from |presentation_connection_state_callbacks_|.
   void OnPresentationConnectionStateCallbackRemoved(
       const MediaRoute::Id& route_id);
 
   // KeyedService
   void Shutdown() override;
-
   std::unique_ptr<InternalMediaRoutesObserver> internal_routes_observer_;
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterBase);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_