Fix flaky test ContentSerializedNavigationBuilderTest.ToNavigationEntry

components/sessions/content/content_serialized_navigation_driver.h

 // Copyright 2014 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_SESSIONS_CONTENT_CONTENT_SERIALIZED_NAVIGATION_DRIVER_H_
 #define COMPONENTS_SESSIONS_CONTENT_CONTENT_SERIALIZED_NAVIGATION_DRIVER_H_
 
 #include "components/sessions/core/serialized_navigation_driver.h"
 
 #include <map>
@@ skipping 42 matching lines @@
       std::unique_ptr<ExtendedInfoHandler> handler);
 
   using ExtendedInfoHandlerMap =
       std::map<std::string, std::unique_ptr<ExtendedInfoHandler>>;
 
   // Returns all the registered handlers to deal with the extended info.
   const ExtendedInfoHandlerMap& GetAllExtendedInfoHandlers() const;
 
  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_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSerializedNavigationDriver);
 };
 
 }  // namespace sessions
 
 #endif  // COMPONENTS_SESSIONS_CONTENT_CONTENT_SERIALIZED_NAVIGATION_DRIVER_H_