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

extensions/renderer/script_context_browsertest.cc

 // 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/public/renderer/render_frame.h"
+#include "content/public/test/frame_load_waiter.h"
 #include "content/public/test/render_view_test.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 using blink::WebFrame;
 
 namespace extensions {
 namespace {
 
 class ScriptContextTest : public content::RenderViewTest {
  protected:
   GURL GetEffectiveDocumentURL(const WebFrame* frame) {
     return ScriptContext::GetEffectiveDocumentURL(
         frame, frame->document().url(), true);
   }
 };
 
-// http://crbug.com/391894
-TEST_F(ScriptContextTest, DISABLED_GetEffectiveDocumentURL) {
+TEST_F(ScriptContextTest, GetEffectiveDocumentURL) {
   GURL top_url("http://example.com/");
   GURL different_url("http://example.net/");
   GURL blank_url("about:blank");
   GURL srcdoc_url("about:srcdoc");
 
   const char frame_html[] =
       "<iframe name='frame1' srcdoc=\""
       "  <iframe name='frame1_1'></iframe>"
       "  <iframe name='frame1_2' sandbox=''></iframe>"
       "\"></iframe>"
       "<iframe name='frame2' sandbox='' srcdoc=\""
       "  <iframe name='frame2_1'></iframe>"
       "\"></iframe>"
       "<iframe name='frame3'></iframe>";
 
   const char frame3_html[] = "<iframe name='frame3_1'></iframe>";
 
   WebFrame* frame = GetMainFrame();
   ASSERT_TRUE(frame);
 
   frame->loadHTMLString(frame_html, top_url);
-  do {
-    ProcessPendingMessages();
-  } while (frame->isLoading());
+  content::FrameLoadWaiter(content::RenderFrame::FromWebFrame(frame)).Wait();
 
   WebFrame* frame1 = frame->findChildByName("frame1");
   ASSERT_TRUE(frame1);
   WebFrame* frame1_1 = frame1->findChildByName("frame1_1");
   ASSERT_TRUE(frame1_1);
   WebFrame* frame1_2 = frame1->findChildByName("frame1_2");
   ASSERT_TRUE(frame1_2);
   WebFrame* frame2 = frame->findChildByName("frame2");
   ASSERT_TRUE(frame2);
   WebFrame* frame2_1 = frame2->findChildByName("frame2_1");
   ASSERT_TRUE(frame2_1);
   WebFrame* frame3 = frame->findChildByName("frame3");
   ASSERT_TRUE(frame3);
 
   // Load a blank document in a frame from a different origin.
   frame3->loadHTMLString(frame3_html, different_url);
-  do {
-    ProcessPendingMessages();
-  } while (frame3->isLoading());
+  content::FrameLoadWaiter(content::RenderFrame::FromWebFrame(frame3)).Wait();
 
   WebFrame* frame3_1 = frame->findChildByName("frame3");
   ASSERT_TRUE(frame3_1);
 
   // Top-level frame
   EXPECT_EQ(GetEffectiveDocumentURL(frame), top_url);
   // top -> srcdoc = inherit
   EXPECT_EQ(GetEffectiveDocumentURL(frame1), top_url);
   // top -> srcdoc -> about:blank = inherit
   EXPECT_EQ(GetEffectiveDocumentURL(frame1_1), top_url);
   // top -> srcdoc -> about:blank sandboxed = same URL
   EXPECT_EQ(GetEffectiveDocumentURL(frame1_2), blank_url);
 
   // top -> srcdoc [sandboxed] = same URL
   EXPECT_EQ(GetEffectiveDocumentURL(frame2), srcdoc_url);
   // top -> srcdoc [sandboxed] -> about:blank = same URL
   EXPECT_EQ(GetEffectiveDocumentURL(frame2_1), blank_url);
 
   // top -> different origin = different origin
   EXPECT_EQ(GetEffectiveDocumentURL(frame3), different_url);
   // top -> different origin -> about:blank = inherit
   EXPECT_EQ(GetEffectiveDocumentURL(frame3_1), different_url);
 }
 
 }  // namespace
 }  // namespace extensions