Change ScriptContextTest.GetEffectiveDocumentURL to use FrameLoadWaiter and re-enable the test.

content/test/frame_load_waiter.cc

Index: content/test/frame_load_waiter.cc
diff --git a/content/test/frame_load_waiter.cc b/content/test/frame_load_waiter.cc
deleted file mode 100644
index 6343f8523f010c4a5d8a5d787215167b50c8c46c..0000000000000000000000000000000000000000
--- a/content/test/frame_load_waiter.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 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/test/frame_load_waiter.h"
-
-#include "base/location.h"
-#include "base/message_loop/message_loop.h"
-
-namespace content {
-
-FrameLoadWaiter::FrameLoadWaiter(RenderFrame* frame)
-    : RenderFrameObserver(frame) {
-}
-
-void FrameLoadWaiter::Wait() {
-  // Pump messages until Blink's threaded HTML parser finishes.
-  run_loop_.Run();
-}
-
-void FrameLoadWaiter::DidFinishLoad() {
-  // Post a task to quit instead of quitting directly, since the load completion
-  // may trigger other IPCs that tests are expecting.
-  base::MessageLoop::current()->PostTask(FROM_HERE, run_loop_.QuitClosure());
-}
-
-}  // namespace content