Refactor the loading tracking logic in WebContentsImpl.

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 1ed80a1c192ea73e1d8267af2d5c332166813131..f8fbbf8fe93cd8129031f1370854ad7e2cba8122 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -966,6 +966,10 @@ class CONTENT_EXPORT WebContentsImpl
   void RemoveAllMediaPlayerEntries(RenderFrameHost* render_frame_host,
                                    ActiveMediaPlayerMap* player_map);
 
+  // Returns true if one of the nodes in the frame_tree_ is loading,

[nasko, 2015/02/13 00:16:29]

nit: "at least one of", |frame_tree_|

[Fabrice (no longer in Chrome), 2015/02/13 18:04:25]

Done.

+  // false otherwise.

[carlosk, 2015/02/13 15:05:41]

nit: the otherwise case here seems redundant.

[Fabrice (no longer in Chrome), 2015/02/24 13:14:46]

Not sure about the style, but there are some others like it in the codebase:
https://code.google.com/p/chromium/codesearch#search/&q=%22false%20otherwise%...

[carlosk, 2015/03/02 14:17:28]

Acknowledged.

+  bool IsTreeLoading();

[Charlie Reis, 2015/02/13 01:01:51]

nit: IsLoading might be clearer.

[Fabrice (no longer in Chrome), 2015/02/13 18:04:25]

There already is an IsLoading in WebContents implementation.
I renamed it to IsFrameTreeLoading instead.

+
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
@@ -1054,18 +1058,10 @@ class CONTENT_EXPORT WebContentsImpl
   net::LoadStateWithParam load_state_;
   base::string16 load_state_host_;
 
-  // LoadingProgressMap maps FrameTreeNode IDs to a double representing that
-  // frame's completion (from 0 to 1).
-  typedef base::hash_map<int64, double> LoadingProgressMap;
-  LoadingProgressMap loading_progresses_;
   double loading_total_progress_;
 
   base::TimeTicks loading_last_progress_update_;
 
-  // Counter to track how many frames have sent start notifications but not
-  // stop notifications.
-  int loading_frames_in_progress_;
-
   // Upload progress, for displaying in the status bar.
   // Set to zero when there is no significant upload happening.
   uint64 upload_size_;