Move loadType() to DocumentLoader

third_party/WebKit/Source/core/loader/ProgressTrackerTest.cpp

 // Copyright 2016 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.
 
 #include "core/loader/ProgressTracker.h"
 
 #include "core/frame/Settings.h"
 #include "core/loader/EmptyClients.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceResponse.h"
@@ skipping 34 matching lines @@
 
   LocalFrame& frame() const { return m_dummyPageHolder->frame(); }
   ProgressTracker& progress() const { return frame().loader().progress(); }
   double lastProgress() const { return m_client->lastProgress(); }
   const ResourceResponse& responseHeaders() const { return m_response; }
 
   // Reports a 1024-byte "main resource" (VeryHigh priority) request/response
   // to ProgressTracker with identifier 1, but tests are responsible for
   // emulating payload and load completion.
   void emulateMainResourceRequestAndResponse() const {
-    progress().progressStarted();
+    progress().progressStarted(FrameLoadTypeStandard);
     progress().willStartLoading(1ul, ResourceLoadPriorityVeryHigh);
     EXPECT_EQ(0.0, lastProgress());
     progress().incrementProgress(1ul, responseHeaders());
     EXPECT_EQ(0.0, lastProgress());
   }
 
  private:
   Persistent<ProgressClient> m_client;
   std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
   ResourceResponse m_response;
 };
 
 TEST_F(ProgressTrackerTest, Static) {
-  progress().progressStarted();
+  progress().progressStarted(FrameLoadTypeStandard);
   EXPECT_EQ(0.0, lastProgress());
   progress().finishedParsing();
   EXPECT_EQ(1.0, lastProgress());
 }
 
 TEST_F(ProgressTrackerTest, MainResourceOnly) {
   emulateMainResourceRequestAndResponse();
 
   // .2 for committing, .25 out of .5 possible for bytes received.
   progress().incrementProgress(1ul, 512);
@@ skipping 37 matching lines @@
   // .2 for finishing parsing, .5 for all bytes received.
   // Medium priority resource is ignored.
   progress().completeProgress(1ul);
   EXPECT_EQ(0.7, lastProgress());
 
   progress().finishedParsing();
   EXPECT_EQ(1.0, lastProgress());
 }
 
 }  // namespace blink