Revert of Make start/stop loading notifications per-frame

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 5024 matching lines @@
     ASSERT_FALSE(image.isNull());
     EXPECT_EQ(image.size().width, 10);
     EXPECT_EQ(image.size().height, 10);
 //    FIXME: The rest of this test is disabled since the ImageDecodeCache state may be inconsistent when this test runs.
 //    crbug.com/266088
 //    SkBitmap bitmap = image.getSkBitmap();
 //    SkAutoLockPixels locker(bitmap);
 //    EXPECT_EQ(bitmap.getColor(0, 0), SK_ColorBLUE);
 }
 
-class TestStartStopCallbackWebFrameClient : public WebFrameClient {
+class TestStartStopCallbackWebViewClient : public WebViewClient {
 public:
-    TestStartStopCallbackWebFrameClient()
+    TestStartStopCallbackWebViewClient()
         : m_startLoadingCount(0)
         , m_stopLoadingCount(0)
         , m_differentDocumentStartCount(0)
     {
     }
 
     virtual void didStartLoading(bool toDifferentDocument) OVERRIDE
     {
         m_startLoadingCount++;
         if (toDifferentDocument)
@@ skipping 11 matching lines @@
 
 private:
     int m_startLoadingCount;
     int m_stopLoadingCount;
     int m_differentDocumentStartCount;
 };
 
 TEST_F(WebFrameTest, PushStateStartsAndStops)
 {
     registerMockedHttpURLLoad("push_state.html");
-    TestStartStopCallbackWebFrameClient client;
+    TestStartStopCallbackWebViewClient client;
     FrameTestHelpers::WebViewHelper webViewHelper;
-    webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);
+    webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, 0, &client);
     runPendingTasks();
 
     EXPECT_EQ(client.startLoadingCount(), 2);
     EXPECT_EQ(client.stopLoadingCount(), 2);
     EXPECT_EQ(client.differentDocumentStartCount(), 1);
 }
 
 class TestHistoryWebFrameClient : public WebFrameClient {
 public:
     TestHistoryWebFrameClient()
@@ skipping 298 matching lines @@
     EXPECT_EQ(2U, container->percentHeightDescendants()->size());
     EXPECT_TRUE(container->percentHeightDescendants()->contains(percentHeightInAnonymous));
     EXPECT_TRUE(container->percentHeightDescendants()->contains(percentHeightDirectChild));
 
     WebCore::RenderBlock* anonymousBlock = percentHeightInAnonymous->containingBlock();
     EXPECT_TRUE(anonymousBlock->isAnonymous());
     EXPECT_FALSE(anonymousBlock->hasPercentHeightDescendants());
 }
 
 } // namespace