Revert of Prepare browser_tests for data: urls being async

content/public/test/render_view_test.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 "content/public/test/render_view_test.h"
 
 #include "base/run_loop.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
@@ skipping 95 matching lines @@
       GetMainFrame()->executeScriptAndReturnValue(WebScriptSource(script));
   if (result.IsEmpty() || !result->IsInt32())
     return false;
 
   if (int_result)
     *int_result = result->Int32Value();
 
   return true;
 }
 
-class FrameLoadWaiter : public content::RenderViewObserver {
- public:
-  FrameLoadWaiter(RenderView* view, base::MessageLoop* msg_loop)
-      : content::RenderViewObserver(view),
-        msg_loop_(msg_loop) {}
-
-  virtual void DidFinishLoad(blink::WebLocalFrame* frame) OVERRIDE {
-    msg_loop_->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
-  }
-
-  void Wait() {
-    // We can't just post a quit message here, blink parses on another
-    // thread and may post additional messages as it parses content.
-    msg_loop_->Run();
-  }
- private:
-  base::MessageLoop* msg_loop_;
-
-  DISALLOW_COPY_AND_ASSIGN(FrameLoadWaiter);
-};
-
 void RenderViewTest::LoadHTML(const char* html) {
   std::string url_str = "data:text/html;charset=utf-8,";
   url_str.append(html);
   GURL url(url_str);
-  FrameLoadWaiter waiter(view_, &msg_loop_);
+
   GetMainFrame()->loadRequest(WebURLRequest(url));
+
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
-  waiter.Wait();
+  ProcessPendingMessages();
 }
 
 void RenderViewTest::GoBack(const blink::WebHistoryItem& item) {
   GoToOffset(-1, item);
 }
 
 void RenderViewTest::GoForward(const blink::WebHistoryItem& item) {
   GoToOffset(1, item);
 }
 
@@ skipping 285 matching lines @@
   FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
                                      navigate_params);
   impl->main_render_frame()->OnMessageReceived(navigate_message);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   ProcessPendingMessages();
 }
 
 }  // namespace content