Revert 184352

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 184354)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -387,7 +387,7 @@
 #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)) {
@@ -790,14 +790,14 @@
 
 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.
@@ -806,10 +806,8 @@
     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)));
     }
   }
 
@@ -820,7 +818,7 @@
          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)));
     }
   }
 
@@ -831,7 +829,7 @@
          iter != browser_action->default_icon.map().end();
          ++iter) {
       image_paths.insert(
-          base::FilePath::FromWStringHack(base::UTF8ToWide(iter->second)));
+          base::FilePath::FromWStringHack(UTF8ToWide(iter->second)));
     }
   }