Fixes bug introduced in r28333, where we were checking if path.empty() instea...

chrome/browser/extensions/extension_file_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_file_util.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 131 matching lines @@
   if (!ValidateExtension(extension.get(), error))
     return NULL;
 
   return extension.release();
 }
 
 bool ValidateExtension(Extension* extension, std::string* error) {
   // Validate icons exist.
   for (std::map<int, std::string>::const_iterator iter =
        extension->icons().begin(); iter != extension->icons().end(); ++iter) {
-    if (extension->GetResource(iter->second).GetFilePath().empty()) {
+    const FilePath path = extension->GetResource(iter->second).GetFilePath();
+    if (!file_util::PathExists(path)) {
       *error = StringPrintf("Could not load extension icon '%s'.",
                             iter->second.c_str());
       return false;
     }
   }
 
   // Theme resource validation.
   if (extension->IsTheme()) {
     DictionaryValue* images_value = extension->GetThemeImages();
     if (images_value) {
@@ skipping 17 matching lines @@
   }
 
   // Validate that claimed script resources actually exist.
   for (size_t i = 0; i < extension->content_scripts().size(); ++i) {
     const UserScript& script = extension->content_scripts()[i];
 
     for (size_t j = 0; j < script.js_scripts().size(); j++) {
       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()) {
+      if (!file_util::PathExists(path)) {
         *error = StringPrintf("Could not load '%s' for content script.",
                               WideToUTF8(path.ToWStringHack()).c_str());
         return false;
       }
     }
 
     for (size_t j = 0; j < script.css_scripts().size(); j++) {
       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()) {
+      if (!file_util::PathExists(path)) {
         *error = StringPrintf("Could not load '%s' for content script.",
                               WideToUTF8(path.ToWStringHack()).c_str());
         return false;
       }
     }
   }
 
   // Validate claimed plugin paths.
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
@@ skipping 16 matching lines @@
   }
 
   // Validate icon location for page actions.
   ExtensionAction* page_action = extension->page_action();
   if (page_action) {
     std::vector<std::string> icon_paths(*page_action->icon_paths());
     if (!page_action->default_icon_path().empty())
       icon_paths.push_back(page_action->default_icon_path());
     for (std::vector<std::string>::iterator iter = icon_paths.begin();
          iter != icon_paths.end(); ++iter) {
-      if (extension->GetResource(*iter).GetFilePath().empty()) {
+      if (!file_util::PathExists(extension->GetResource(*iter).GetFilePath())) {
         *error = StringPrintf("Could not load icon '%s' for page action.",
                               iter->c_str());
         return false;
       }
     }
   }
 
   // Validate icon location for browser actions.
   // Note: browser actions don't use the icon_paths().
   ExtensionAction* browser_action = extension->browser_action();
   if (browser_action) {
-    std::string default_icon_path = browser_action->default_icon_path();
-    if (!default_icon_path.empty()) {
-      if (extension->GetResource(default_icon_path).GetFilePath().empty()) {
+    std::string path = browser_action->default_icon_path();
+    if (!path.empty() &&
+        !file_util::PathExists(extension->GetResource(path).GetFilePath())) {
         *error = StringPrintf("Could not load icon '%s' for browser action.",
-                              default_icon_path.c_str());
+                              path.c_str());
         return false;
-      }
+    }
+  }
+
+  // Validate background page location.
+  if (!extension->background_url().is_empty()) {
+    const std::string page_path = extension->background_url().path();
+    const FilePath path = extension->GetResource(page_path).GetFilePath();
+    if (!file_util::PathExists(path)) {
+      *error = StringPrintf("Could not load background page '%s'.",
+                            WideToUTF8(path.ToWStringHack()).c_str());
+      return false;
     }
   }
 
   // Check children of extension root to see if any of them start with _ and is
   // not on the reserved list.
   if (!CheckForIllegalFilenames(extension->path(), error)) {
     return false;
   }
 
   return true;
@@ skipping 134 matching lines @@
         "Filenames starting with \"_\" are reserved for use by the system.",
         filename.c_str());
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace extension_file_util