Move ReadFileToString to the base namespace.

chrome/utility/importer/ie_importer_win.cc

 // Copyright (c) 2012 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/utility/importer/ie_importer_win.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 304 matching lines @@
   if (FAILED(property_storage->ReadMultiple(1, properties, output.Receive())) ||
       output.get().vt != VT_LPWSTR)
     return GURL();
   return GURL(WideToUTF16(output.get().pwszVal));
 }
 
 // Reads the favicon imaga data in an NTFS alternate data stream. This is where
 // IE7 and above store the data.
 bool ReadFaviconDataFromInternetShortcut(const string16& file,
                                          std::string* data) {
-  return file_util::ReadFileToString(
+  return base::ReadFileToString(
       base::FilePath(file + kFaviconStreamName), data);
 }
 
 // Reads the favicon imaga data in the Internet cache. IE6 doesn't hold the data
 // explicitly, but it might be found in the cache.
 bool ReadFaviconDataFromCache(const GURL& favicon_url, std::string* data) {
   std::wstring url_wstring(UTF8ToWide(favicon_url.spec()));
   DWORD info_size = 0;
   GetUrlCacheEntryInfoEx(url_wstring.c_str(), NULL, &info_size, NULL, NULL,
                          NULL, 0);
   if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
     return false;
 
   std::vector<char> buf(info_size);
   INTERNET_CACHE_ENTRY_INFO* cache =
       reinterpret_cast<INTERNET_CACHE_ENTRY_INFO*>(&buf[0]);
   if (!GetUrlCacheEntryInfoEx(url_wstring.c_str(), cache, &info_size, NULL,
                               NULL, NULL, 0)) {
     return false;
   }
-  return file_util::ReadFileToString(base::FilePath(cache->lpszLocalFileName),
-                                     data);
+  return base::ReadFileToString(base::FilePath(cache->lpszLocalFileName), data);
 }
 
 // Reads the binary image data of favicon of an internet shortcut file |file|.
 // |favicon_url| read by ReadFaviconURLFromInternetShortcut is also needed to
 // examine the IE cache.
 bool ReadReencodedFaviconData(const string16& file,
                               const GURL& favicon_url,
                               std::vector<unsigned char>* data) {
   std::string image_data;
   if (!ReadFaviconDataFromInternetShortcut(file, &image_data) &&
@@ skipping 516 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }