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

chrome/browser/extensions/extension_startup_unittest.cc

 // Copyright (c) 2008 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 113 matching lines @@
                      NotificationService::AllSources());
       ui_test_utils::RunMessageLoop();
       registrar_.Remove(this, NotificationType::USER_SCRIPTS_UPDATED,
                         NotificationService::AllSources());
     }
     ASSERT_TRUE(master->ScriptsReady());
   }
 
   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"",
         L"window.domAutomationController.send("
         L"document.defaultView.getComputedStyle(document.body, null)."
         L"getPropertyValue('background-color') == 'rgb(245, 245, 220)')",
         &result);
     EXPECT_EQ(expect_css, result);
 
@@ skipping 78 matching lines @@
 
   ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
 
   bool result = false;
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       browser()->GetSelectedTabContents()->render_view_host(), L"",
       L"window.domAutomationController.send(document.title == 'Modified')",
       &result);
   EXPECT_FALSE(result);
 }