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

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 10 matching lines @@
       'public/test/browser_test_base.h',
       'public/test/browser_test.h',
       'public/test/browser_test_utils.cc',
       'public/test/browser_test_utils.h',
       'public/test/content_test_suite_base.cc',
       'public/test/content_test_suite_base.h',
       'public/test/download_test_observer.cc',
       'public/test/download_test_observer.h',
       'public/test/fake_speech_recognition_manager.cc',
       'public/test/fake_speech_recognition_manager.h',
+      'public/test/frame_load_waiter.cc',
+      'public/test/frame_load_waiter.h',
       'public/test/javascript_test_observer.cc',
       'public/test/javascript_test_observer.h',
       'public/test/mock_blob_url_request_context.cc',
       'public/test/mock_blob_url_request_context.h',
       'public/test/mock_download_item.cc',
       'public/test/mock_download_item.h',
       'public/test/mock_download_manager.cc',
       'public/test/mock_download_manager.h',
       'public/test/mock_notification_observer.cc',
       'public/test/mock_notification_observer.h',
@@ skipping 59 matching lines @@
       'browser/renderer_host/test/no_transport_image_transport_factory_android.cc',
       'browser/renderer_host/test/no_transport_image_transport_factory_android.h',
       'test/appcache_test_helper.cc',
       'test/appcache_test_helper.h',
       'test/blink_test_environment.cc',
       'test/blink_test_environment.h',
       'test/content_browser_test_utils_internal.cc',
       'test/content_browser_test_utils_internal.h',
       'test/content_test_suite.cc',
       'test/content_test_suite.h',
-      'test/frame_load_waiter.cc',
-      'test/frame_load_waiter.h',
       'test/mock_google_streaming_server.cc',
       'test/mock_google_streaming_server.h',
       'test/mock_keyboard.cc',
       'test/mock_keyboard.h',
       'test/mock_keyboard_driver_win.cc',
       'test/mock_keyboard_driver_win.h',
       'test/mock_render_process.cc',
       'test/mock_render_process.h',
       'test/mock_webblob_registry_impl.cc',
       'test/mock_webblob_registry_impl.h',
@@ skipping 1759 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }