Fix flaky test ContentSerializedNavigationBuilderTest.ToNavigationEntry

components/sessions/content/content_serialized_navigation_driver.h

Index: components/sessions/content/content_serialized_navigation_driver.h
diff --git a/components/sessions/content/content_serialized_navigation_driver.h b/components/sessions/content/content_serialized_navigation_driver.h
index a471738f33930721bcfc8720ee7899f51e16b79a..8d1cfa1f573ef1e4b88a25c73305978335f411fb 100644
--- a/components/sessions/content/content_serialized_navigation_driver.h
+++ b/components/sessions/content/content_serialized_navigation_driver.h
@@ -61,6 +61,10 @@ class SESSIONS_EXPORT ContentSerializedNavigationDriver
  private:
   ContentSerializedNavigationDriver();
   friend struct base::DefaultSingletonTraits<ContentSerializedNavigationDriver>;

[sky, 2016/10/07 15:35:25]

Move all the friends before the constructor, newline, then constructor.

[jianli, 2016/10/12 21:38:00]

Done.

+  friend class ContentSerializedNavigationBuilderTest;
+
+  // Removes all the registered extended info handlers. For testing only.
+  void RemoveAllExtendedInfoHandlersForTesting();

[sky, 2016/10/07 15:35:25]

Can the test do extended_info_handler_map_.clear() directly so we're not
exposing a function only for testing?

[jianli, 2016/10/12 21:38:00]

Done.

 
   ExtendedInfoHandlerMap extended_info_handler_map_;