Move extensions manifest IconsHandler to //extensions

chrome/common/extensions/extension_file_util.cc

 // Copyright (c) 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 "chrome/common/extensions/extension_file_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/manifest_handlers/theme_handler.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler.h"
+#include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/generated_resources.h"
 #include "net/base/file_stream.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 using extensions::ExtensionResource;
 using extensions::Manifest;
 
 namespace errors = extensions::manifest_errors;
 
@@ skipping 172 matching lines @@
     if (!Extension::ParsePEMKeyBytes(key_contents, &key_bytes)) {
       // If we can't parse the key, assume it's ok too.
       continue;
     }
 
     result.push_back(current);
   }
   return result;
 }
 
-bool ValidateFilePath(const base::FilePath& path) {
-  int64 size = 0;
-  if (!base::PathExists(path) ||
-      !base::GetFileSize(path, &size) ||
-      size == 0) {
-    return false;
-  }
-
-  return true;
-}
-
-bool ValidateExtensionIconSet(const ExtensionIconSet& icon_set,
-                              const Extension* extension,
-                              int error_message_id,
-                              std::string* error) {
-  for (ExtensionIconSet::IconMap::const_iterator iter = icon_set.map().begin();
-       iter != icon_set.map().end();
-       ++iter) {
-    const base::FilePath path =
-        extension->GetResource(iter->second).GetFilePath();
-    if (!ValidateFilePath(path)) {
-      *error = l10n_util::GetStringFUTF8(error_message_id,
-                                         base::UTF8ToUTF16(iter->second));
-      return false;
-    }
-  }
-  return true;
-}
-
 bool ValidateExtension(const Extension* extension,
                        std::string* error,
                        std::vector<extensions::InstallWarning>* warnings) {
   // Ask registered manifest handlers to validate their paths.
   if (!extensions::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
@@ skipping 123 matching lines @@
     return base::FilePath();
   }
   return temp_path;
 }
 
 void DeleteFile(const base::FilePath& path, bool recursive) {
   base::DeleteFile(path, recursive);
 }
 
 }  // namespace extension_file_util