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

chrome/browser/extensions/extensions_service_unittest.cc

Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc	(revision 32777)
+++ chrome/browser/extensions/extensions_service_unittest.cc	(working copy)
@@ -539,11 +539,11 @@
       extension->toolstrips();
   ASSERT_EQ(2u, scripts.size());
   EXPECT_EQ(3u, scripts[0].url_patterns().size());
+  EXPECT_EQ("file://*",
+            scripts[0].url_patterns()[0].GetAsString());
   EXPECT_EQ("http://*.google.com/*",
-            scripts[0].url_patterns()[0].GetAsString());
+            scripts[0].url_patterns()[1].GetAsString());
   EXPECT_EQ("https://*.google.com/*",
-            scripts[0].url_patterns()[1].GetAsString());
-  EXPECT_EQ("http://localhost/*",
             scripts[0].url_patterns()[2].GetAsString());
   EXPECT_EQ(2u, scripts[0].js_scripts().size());
   ExtensionResource resource00(scripts[0].js_scripts()[0].extension_root(),