Revert of Change extension icon load errors to warnings

extensions/common/file_util.cc

 // Copyright 2013 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 "extensions/common/file_util.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 34 matching lines @@
 namespace file_util {
 namespace {
 
 enum SafeInstallationFlag {
   DEFAULT,   // Default case, controlled by a field trial.
   DISABLED,  // Safe installation is disabled.
   ENABLED,   // Safe installation is enabled.
 };
 SafeInstallationFlag g_use_safe_installation = DEFAULT;
 
+// Returns true if the given file path exists and is not zero-length.
+bool ValidateFilePath(const base::FilePath& path) {
+  int64 size = 0;
+  if (!base::PathExists(path) ||
+      !base::GetFileSize(path, &size) ||
+      size == 0) {
+    return false;
+  }
+
+  return true;
+}
+
 // Returns true if the extension installation should flush all files and the
 // directory.
 bool UseSafeInstallation() {
   if (g_use_safe_installation == DEFAULT) {
     const char kFieldTrialName[] = "ExtensionUseSafeInstallation";
     const char kEnable[] = "Enable";
     return base::FieldTrialList::FindFullName(kFieldTrialName) == kEnable;
   }
 
   return g_use_safe_installation == ENABLED;
@@ skipping 187 matching lines @@
   }
 
   if (!root->IsType(base::Value::TYPE_DICTIONARY)) {
     *error = l10n_util::GetStringUTF8(IDS_EXTENSION_MANIFEST_INVALID);
     return NULL;
   }
 
   return base::DictionaryValue::From(std::move(root));
 }
 
-bool ValidateFilePath(const base::FilePath& path) {
-  int64 size = 0;
-  return base::PathExists(path) && base::GetFileSize(path, &size) && size != 0;
-}
-
 bool ValidateExtension(const Extension* extension,
                        std::string* error,
                        std::vector<InstallWarning>* warnings) {
   // Ask registered manifest handlers to validate their paths.
   if (!ManifestHandler::ValidateExtension(extension, error, warnings))
     return false;
 
   // Check children of extension root to see if any of them start with _ and is
   // not on the reserved list. We only warn, and do not block the loading of the
   // extension.
@@ skipping 334 matching lines @@
 base::FilePath GetVerifiedContentsPath(const base::FilePath& extension_path) {
   return extension_path.Append(kMetadataFolder)
       .Append(kVerifiedContentsFilename);
 }
 base::FilePath GetComputedHashesPath(const base::FilePath& extension_path) {
   return extension_path.Append(kMetadataFolder).Append(kComputedHashesFilename);
 }
 
 }  // namespace file_util
 }  // namespace extensions