Add a flag to change when android's progress bar completes

content/browser/frame_host/frame_tree.cc

Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 9977976aaba40eb87ec1c970367ba9b3f85a4053..f5fab459cce1bda0ca7789558ed14527530b6dd1 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -21,6 +21,7 @@
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/common/content_switches_internal.h"
 #include "content/common/input_messages.h"
 #include "content/common/site_isolation_policy.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
@@ -368,23 +369,26 @@ void FrameTree::FrameRemoved(FrameTreeNode* frame) {
     on_frame_removed_.Run(frame->current_frame_host());
 }
 
-void FrameTree::UpdateLoadProgress() {
+void FrameTree::UpdateLoadProgress(FrameTreeNode* frame) {
   double progress = 0.0;
-  int frame_count = 0;
-
-  for (FrameTreeNode* node : Nodes()) {
-    // Ignore the current frame if it has not started loading.
-    if (!node->has_started_loading())
-      continue;
-
-    // Collect progress.
-    progress += node->loading_progress();
-    frame_count++;
+  if (GetProgressBarCompletionOptions() ==
+      ProgressBarCompletionOptions::LOAD_EVENT) {
+    int frame_count = 0;
+    for (FrameTreeNode* node : Nodes()) {
+      // Ignore the current frame if it has not started loading.
+      if (!node->has_started_loading())
+        continue;
+
+      // Collect progress.
+      progress += node->loading_progress();
+      frame_count++;
+    }
+    if (frame_count != 0)
+      progress /= frame_count;
+  } else if (frame->IsMainFrame() && frame->has_started_loading()) {
+    progress = frame->loading_progress();
   }
 
-  if (frame_count != 0)
-    progress /= frame_count;
-
   if (progress <= load_progress_)
     return;
   load_progress_ = progress;