Attempt 2 to enable async data: URL loading.

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 17 matching lines @@
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_utils.h"
 #include "content/renderer/accessibility/renderer_accessibility.h"
 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
+#include "content/test/frame_load_waiter.h"
 #include "content/test/mock_keyboard.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
@@ skipping 1959 matching lines @@
   FrameMsg_Navigate_Params nav_params;
   nav_params.url = GURL("data:text/html,world");
   nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   nav_params.transition = PAGE_TRANSITION_TYPED;
   nav_params.current_history_list_length = 1;
   nav_params.current_history_list_offset = 0;
   nav_params.pending_history_list_offset = 1;
   nav_params.page_id = -1;
   nav_params.frame_to_navigate = "frame";
   frame()->OnNavigate(nav_params);
-  ProcessPendingMessages();
+  FrameLoadWaiter(
+      RenderFrame::FromWebFrame(frame()->GetWebFrame()->firstChild())).Wait();
 
   // Copy the document content to std::wstring and compare with the
   // expected result.
   const int kMaxOutputCharacters = 256;
   std::string output = base::UTF16ToUTF8(
       GetMainFrame()->contentAsText(kMaxOutputCharacters));
   EXPECT_EQ(output, "hello \n\nworld");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
@@ skipping 129 matching lines @@
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
   params.page_id = -1;
   params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   params.url = GURL("data:text/html,test data");
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
-  ProcessPendingMessages();
+  // The error page itself is loaded asynchronously.
+  FrameLoadWaiter(frame()).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
             base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
 }
 
 // Tests if IME API's candidatewindow* events sent from browser are handled
 // in renderer.
 TEST_F(RenderViewImplTest, SendCandidateWindowEvents) {
   // Sends an HTML with an <input> element and scripts to the renderer.
   // The script handles all 3 of candidatewindow* events for an
@@ skipping 64 matching lines @@
   // The load started, we should receive a start notification and a progress
   // update with the minimum progress.
   const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_DidChangeLoadProgress::ID);
   EXPECT_TRUE(message);
   Tuple1<double> progress_value;
   ViewHostMsg_DidChangeLoadProgress::Read(message, &progress_value);
   EXPECT_EQ(0.1, progress_value.a);
   render_thread_->sink().ClearMessages();
 
-  ProcessPendingMessages();
+  FrameLoadWaiter(frame()).Wait();
 
   // The data url has loaded, so we should see a progress change to 1.0 (done)
   // and a stop notification.
   message = render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_DidChangeLoadProgress::ID);
   EXPECT_TRUE(message);
   ViewHostMsg_DidChangeLoadProgress::Read(message, &progress_value);
   EXPECT_EQ(1.0, progress_value.a);
 
   EXPECT_TRUE(render_thread_->sink().GetFirstMessageMatching(
@@ skipping 95 matching lines @@
             view()->renderer_accessibility()->GetType());
 
   view()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);
   ASSERT_EQ(AccessibilityModeEditableTextOnly, view()->accessibility_mode());
   ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());
   ASSERT_EQ(RendererAccessibilityTypeFocusOnly,
             view()->renderer_accessibility()->GetType());
 }
 
 }  // namespace content