Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1243)

Unified Diff: chrome/browser/extensions/extensions_service_unittest.cc

Issue 267051: Minimize dependency of user scripts.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc (revision 29458)
+++ chrome/browser/extensions/extensions_service_unittest.cc (working copy)
@@ -540,14 +540,20 @@
EXPECT_EQ("https://*.google.com/*",
scripts[0].url_patterns()[2].GetAsString());
EXPECT_EQ(2u, scripts[0].js_scripts().size());
- EXPECT_TRUE(scripts[0].js_scripts()[0].resource().ComparePathWithDefault(
+ ExtensionResource resource00(scripts[0].js_scripts()[0].extension_root(),
+ scripts[0].js_scripts()[0].relative_path());
+ EXPECT_TRUE(resource00.ComparePathWithDefault(
extension->path().AppendASCII("script1.js")));
- EXPECT_TRUE(scripts[0].js_scripts()[1].resource().ComparePathWithDefault(
+ ExtensionResource resource01(scripts[0].js_scripts()[1].extension_root(),
+ scripts[0].js_scripts()[1].relative_path());
+ EXPECT_TRUE(resource01.ComparePathWithDefault(
extension->path().AppendASCII("script2.js")));
EXPECT_TRUE(extension->plugins().empty());
EXPECT_EQ(1u, scripts[1].url_patterns().size());
EXPECT_EQ("http://*.news.com/*", scripts[1].url_patterns()[0].GetAsString());
- EXPECT_TRUE(scripts[1].js_scripts()[0].resource().ComparePathWithDefault(
+ ExtensionResource resource10(scripts[1].js_scripts()[0].extension_root(),
+ scripts[1].js_scripts()[0].relative_path());
+ EXPECT_TRUE(resource10.ComparePathWithDefault(
extension->path().AppendASCII("js_files").AppendASCII("script3.js")));
const std::vector<URLPattern> permissions = extension->host_permissions();
ASSERT_EQ(2u, permissions.size());

Powered by Google App Engine
This is Rietveld 408576698