Merge 32770 - Revert change that disallowed content scripts access to...

chrome/browser/extensions/extension_startup_unittest.cc

Index: chrome/browser/extensions/extension_startup_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_startup_unittest.cc	(revision 32777)
+++ chrome/browser/extensions/extension_startup_unittest.cc	(working copy)
@@ -131,10 +131,13 @@
 
   void TestInjection(bool expect_css, bool expect_script) {
     // Load a page affected by the content script and test to see the effect.
-    HTTPTestServer* server = StartHTTPServer();
-    GURL url = server->TestServerPage("file/extensions/test_file.html");
-    ui_test_utils::NavigateToURL(browser(), url);
+    FilePath test_file;
+    PathService::Get(chrome::DIR_TEST_DATA, &test_file);
+    test_file = test_file.AppendASCII("extensions")
+                         .AppendASCII("test_file.html");
 
+    ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));
+
     bool result = false;
     ui_test_utils::ExecuteJavaScriptAndExtractBool(
         browser()->GetSelectedTabContents()->render_view_host(), L"",