| Index: chrome/browser/extensions/extension_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
|
| index 9ab61ab6c9a7884c30f7418d155fc767a2b94716..f6e839bbfa6574e41a2343ac44f442cc11f0d56e 100644
|
| --- a/chrome/browser/extensions/extension_service_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_service_unittest.cc
|
| @@ -864,30 +864,30 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
|
| AddPattern(&expected_patterns, "http://*.google.com/*");
|
| AddPattern(&expected_patterns, "https://*.google.com/*");
|
| const Extension* extension = loaded_[0].get();
|
| - const extensions::UserScriptList& scripts =
|
| + const extensions::ScriptMetadataList& scripts =
|
| extensions::ContentScriptsInfo::GetContentScripts(extension);
|
| ASSERT_EQ(2u, scripts.size());
|
| - EXPECT_EQ(expected_patterns, scripts[0].url_patterns());
|
| - EXPECT_EQ(2u, scripts[0].js_scripts().size());
|
| + EXPECT_EQ(expected_patterns, scripts[0]->url_patterns());
|
| + EXPECT_EQ(2u, scripts[0]->js_scripts().size());
|
| ExtensionResource resource00(extension->id(),
|
| - scripts[0].js_scripts()[0].extension_root(),
|
| - scripts[0].js_scripts()[0].relative_path());
|
| + scripts[0]->js_scripts()[0]->extension_root(),
|
| + scripts[0]->js_scripts()[0]->relative_path());
|
| base::FilePath expected_path =
|
| base::MakeAbsoluteFilePath(extension->path().AppendASCII("script1.js"));
|
| EXPECT_TRUE(resource00.ComparePathWithDefault(expected_path));
|
| ExtensionResource resource01(extension->id(),
|
| - scripts[0].js_scripts()[1].extension_root(),
|
| - scripts[0].js_scripts()[1].relative_path());
|
| + scripts[0]->js_scripts()[1]->extension_root(),
|
| + scripts[0]->js_scripts()[1]->relative_path());
|
| expected_path =
|
| base::MakeAbsoluteFilePath(extension->path().AppendASCII("script2.js"));
|
| EXPECT_TRUE(resource01.ComparePathWithDefault(expected_path));
|
| EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(extension));
|
| - EXPECT_EQ(1u, scripts[1].url_patterns().patterns().size());
|
| + EXPECT_EQ(1u, scripts[1]->url_patterns().patterns().size());
|
| EXPECT_EQ("http://*.news.com/*",
|
| - scripts[1].url_patterns().begin()->GetAsString());
|
| + scripts[1]->url_patterns().begin()->GetAsString());
|
| ExtensionResource resource10(extension->id(),
|
| - scripts[1].js_scripts()[0].extension_root(),
|
| - scripts[1].js_scripts()[0].relative_path());
|
| + scripts[1]->js_scripts()[0]->extension_root(),
|
| + scripts[1]->js_scripts()[0]->relative_path());
|
| expected_path =
|
| extension->path().AppendASCII("js_files").AppendASCII("script3.js");
|
| expected_path = base::MakeAbsoluteFilePath(expected_path);
|
|
|