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

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

Issue 256022: Loads local resources from current locale subtree if available, if not it fal... (Closed) Base URL: svn://chrome-svn/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
« no previous file with comments | « chrome/browser/extensions/extension_protocols.cc ('k') | chrome/browser/extensions/extensions_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc (revision 28272)
+++ chrome/browser/extensions/extensions_service_unittest.cc (working copy)
@@ -540,21 +540,15 @@
EXPECT_EQ("https://*.google.com/*",
scripts[0].url_patterns()[2].GetAsString());
EXPECT_EQ(2u, scripts[0].js_scripts().size());
- EXPECT_EQ(
- NormalizeSeperators(extension->path().AppendASCII("script1.js").value()),
- NormalizeSeperators(scripts[0].js_scripts()[0].path().value()));
- EXPECT_EQ(
- NormalizeSeperators(extension->path().AppendASCII("script2.js").value()),
- NormalizeSeperators(scripts[0].js_scripts()[1].path().value()));
+ EXPECT_TRUE(scripts[0].js_scripts()[0].resource().ComparePathWithDefault(
+ extension->path().AppendASCII("script1.js")));
+ EXPECT_TRUE(scripts[0].js_scripts()[1].resource().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_EQ(
- NormalizeSeperators(extension->path()
- .AppendASCII("js_files")
- .AppendASCII("script3.js")
- .value()),
- NormalizeSeperators(scripts[1].js_scripts()[0].path().value()));
+ EXPECT_TRUE(scripts[1].js_scripts()[0].resource().ComparePathWithDefault(
+ extension->path().AppendASCII("js_files").AppendASCII("script3.js")));
const std::vector<URLPattern> permissions = extension->host_permissions();
ASSERT_EQ(2u, permissions.size());
EXPECT_EQ("http://*.google.com/*", permissions[0].GetAsString());
« no previous file with comments | « chrome/browser/extensions/extension_protocols.cc ('k') | chrome/browser/extensions/extensions_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698