Refactored an entry struct into separate storage.

content/renderer/android/synchronous_compositor_filter.h

Index: content/renderer/android/synchronous_compositor_filter.h
diff --git a/content/renderer/android/synchronous_compositor_filter.h b/content/renderer/android/synchronous_compositor_filter.h
index a188fdbd7af86e74eb087517cf30983815e9e2f5..c22e094f6f27711c490b306ffb58cb863d6b7ec8 100644
--- a/content/renderer/android/synchronous_compositor_filter.h
+++ b/content/renderer/android/synchronous_compositor_filter.h
@@ -67,9 +67,15 @@ class SynchronousCompositorFilter
   void SendOnIOThread(IPC::Message* message);
 
   // Compositor thread methods.
-  void FilterReadyyOnCompositorThread();
+  void FilterReadyOnCompositorThread();
   void OnMessageReceivedOnCompositorThread(const IPC::Message& message);
   void CheckIsReady(int routing_id);

[hush (inactive), 2016/07/26 21:07:43]

Sorry for being late, but I think we can delete CheckIsReady here. It seems you
can declare a method in .h file, and never implement it in .cc file. 

+  void CreateSynchronousCompositorProxy(
+      int routing_id,
+      ui::SynchronousInputHandlerProxy* synchronous_input_handler_proxy);
+  void SetProxyOutputSurface(
+      int routing_id,
+      SynchronousCompositorOutputSurface* output_surface);
   void UnregisterObjects(int routing_id);
   void RemoveEntryIfNeeded(int routing_id);
   SynchronousCompositorProxy* FindProxy(int routing_id);
@@ -87,15 +93,16 @@ class SynchronousCompositorFilter
   SyncCompositorMap sync_compositor_map_;
 
   bool filter_ready_;
-  struct Entry {
-    SynchronousCompositorOutputSurface* output_surface;
-    ui::SynchronousInputHandlerProxy* synchronous_input_handler_proxy;
-
-    Entry();
-    bool IsReady();
-  };
-  using EntryMap = base::hash_map<int, Entry>;
-  EntryMap entry_map_;
+  using SynchronousInputHandlerProxyMap =
+      base::hash_map<int, ui::SynchronousInputHandlerProxy*>;
+  using OutputSurfaceMap =
+      base::hash_map<int, SynchronousCompositorOutputSurface*>;
+
+  // This is only used before FilterReadyOnCompositorThread.
+  SynchronousInputHandlerProxyMap synchronous_input_handler_proxy_map_;
+
+  // This is only used if input_handler_proxy has not been registered.
+  OutputSurfaceMap output_surface_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFilter);
 };