Revert 184352

chrome/common/extensions/extension.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.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 369 matching lines @@
 ExtensionResource Extension::GetResource(
     const std::string& relative_path) const {
   std::string new_path = relative_path;
   // We have some legacy data where resources have leading slashes.
   // See: http://crbug.com/121164
   if (!new_path.empty() && new_path.at(0) == '/')
     new_path.erase(0, 1);
 #if defined(OS_POSIX)
   base::FilePath relative_file_path(new_path);
 #elif defined(OS_WIN)
-  base::FilePath relative_file_path(base::UTF8ToWide(new_path));
+  base::FilePath relative_file_path(UTF8ToWide(new_path));
 #endif
   ExtensionResource r(id(), path(), relative_file_path);
   if ((creation_flags() & Extension::FOLLOW_SYMLINKS_ANYWHERE)) {
     r.set_follow_symlinks_anywhere();
   }
   return r;
 }
 
 ExtensionResource Extension::GetResource(
     const base::FilePath& relative_file_path) const {
@@ skipping 382 matching lines @@
 bool Extension::ShowConfigureContextMenus() const {
   // Don't show context menu for component extensions. We might want to show
   // options for component extension button but now there is no component
   // extension with options. All other menu items like uninstall have
   // no sense for component extensions.
   return location() != Manifest::COMPONENT;
 }
 
 std::set<base::FilePath> Extension::GetBrowserImages() const {
   std::set<base::FilePath> image_paths;
-  // TODO(viettrungluu): These |FilePath::FromWStringHack(base::UTF8ToWide())|
+  // TODO(viettrungluu): These |FilePath::FromWStringHack(UTF8ToWide())|
   // indicate that we're doing something wrong.
 
   // Extension icons.
   for (ExtensionIconSet::IconMap::const_iterator iter = icons().map().begin();
        iter != icons().map().end(); ++iter) {
     image_paths.insert(
-        base::FilePath::FromWStringHack(base::UTF8ToWide(iter->second)));
+        base::FilePath::FromWStringHack(UTF8ToWide(iter->second)));
   }
 
   // Theme images.
   DictionaryValue* theme_images = ThemeInfo::GetThemeImages(this);
   if (theme_images) {
     for (DictionaryValue::Iterator it(*theme_images); !it.IsAtEnd();
          it.Advance()) {
       std::string val;
-      if (it.value().GetAsString(&val)) {
-        image_paths.insert(base::FilePath::FromWStringHack(
-            base::UTF8ToWide(val)));
-      }
+      if (it.value().GetAsString(&val))
+        image_paths.insert(base::FilePath::FromWStringHack(UTF8ToWide(val)));
     }
   }
 
   const ActionInfo* page_action_info = ActionInfo::GetPageActionInfo(this);
   if (page_action_info && !page_action_info->default_icon.empty()) {
     for (ExtensionIconSet::IconMap::const_iterator iter =
              page_action_info->default_icon.map().begin();
          iter != page_action_info->default_icon.map().end();
          ++iter) {
       image_paths.insert(
-          base::FilePath::FromWStringHack(base::UTF8ToWide(iter->second)));
+          base::FilePath::FromWStringHack(UTF8ToWide(iter->second)));
     }
   }
 
   const ActionInfo* browser_action = ActionInfo::GetBrowserActionInfo(this);
   if (browser_action && !browser_action->default_icon.empty()) {
     for (ExtensionIconSet::IconMap::const_iterator iter =
              browser_action->default_icon.map().begin();
          iter != browser_action->default_icon.map().end();
          ++iter) {
       image_paths.insert(
-          base::FilePath::FromWStringHack(base::UTF8ToWide(iter->second)));
+          base::FilePath::FromWStringHack(UTF8ToWide(iter->second)));
     }
   }
 
   return image_paths;
 }
 
 ExtensionResource Extension::GetIconResource(
     int size, ExtensionIconSet::MatchType match_type) const {
   std::string path = icons().Get(size, match_type);
   return path.empty() ? ExtensionResource() : GetResource(path);
@@ skipping 1889 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions