Minimize dependency of user scripts.

And made some minor lint fixes and code refactoring on the way, based on CR comments of previous attempt.

BUG=none
TEST=Make sure that the extension resources can still be properly localized and that they also load correctly when they are not localized.

Review URL: http://codereview.chromium.org/267051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29512 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index e5b0f85..0bd9507 100644
--- a/chrome/browser/extensions/extension_file_util.cc
+++ b/chrome/browser/extensions/extension_file_util.cc
@@ -184,8 +184,9 @@ bool ValidateExtension(Extension* extension, std::string* error) {
     const UserScript& script = extension->content_scripts()[i];
 
     for (size_t j = 0; j < script.js_scripts().size(); j++) {
-      const FilePath& path =
-        script.js_scripts()[j].resource().GetFilePath();
+      const UserScript::File& js_script = script.js_scripts()[j];
+      const FilePath& path = ExtensionResource::GetFilePath(
+          js_script.extension_root(), js_script.relative_path());
       if (path.empty()) {
         *error = StringPrintf("Could not load '%s' for content script.",
                               WideToUTF8(path.ToWStringHack()).c_str());
@@ -194,8 +195,9 @@ bool ValidateExtension(Extension* extension, std::string* error) {
     }
 
     for (size_t j = 0; j < script.css_scripts().size(); j++) {
-      const FilePath& path =
-        script.css_scripts()[j].resource().GetFilePath();
+      const UserScript::File& css_script = script.css_scripts()[j];
+      const FilePath& path = ExtensionResource::GetFilePath(
+          css_script.extension_root(), css_script.relative_path());
       if (path.empty()) {
         *error = StringPrintf("Could not load '%s' for content script.",
                               WideToUTF8(path.ToWStringHack()).c_str());