Roll DEPS to rlz library r26:30 to get the latest fixes for base library changes.

Also remove the Registry class stub implementations in base/registry.h

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/4166001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63880 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 13 deletions

diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index f2905dd..e8fa047 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -40,8 +40,6 @@
 #include "webkit/glue/password_form.h"
 
 using base::Time;
-using base::win::RegKey;
-using base::win::RegistryValueIterator;
 using webkit_glue::PasswordForm;
 
 namespace {
@@ -259,8 +257,9 @@ void IEImporter::ImportPasswordsIE7() {
   const wchar_t kStorage2Path[] =
       L"Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
 
-  RegKey key(HKEY_CURRENT_USER, kStorage2Path, KEY_READ);
-  RegistryValueIterator reg_iterator(HKEY_CURRENT_USER, kStorage2Path);
+  base::win::RegKey key(HKEY_CURRENT_USER, kStorage2Path, KEY_READ);
+  base::win::RegistryValueIterator reg_iterator(HKEY_CURRENT_USER,
+                                                kStorage2Path);
   while (reg_iterator.Valid() && !cancelled()) {
     // Get the size of the encrypted data.
     DWORD value_len = 0;
@@ -351,7 +350,7 @@ void IEImporter::ImportSearchEngines() {
   const wchar_t kSearchScopePath[] =
       L"Software\\Microsoft\\Internet Explorer\\SearchScopes";
 
-  RegKey key(HKEY_CURRENT_USER, kSearchScopePath, KEY_READ);
+  base::win::RegKey key(HKEY_CURRENT_USER, kSearchScopePath, KEY_READ);
   std::wstring default_search_engine_name;
   const TemplateURL* default_search_engine = NULL;
   std::map<std::string, TemplateURL*> search_engines_map;
@@ -361,7 +360,8 @@ void IEImporter::ImportSearchEngines() {
   while (key_iterator.Valid()) {
     std::wstring sub_key_name = kSearchScopePath;
     sub_key_name.append(L"\\").append(key_iterator.Name());
-    RegKey sub_key(HKEY_CURRENT_USER, sub_key_name.c_str(), KEY_READ);
+    base::win::RegKey sub_key(HKEY_CURRENT_USER, sub_key_name.c_str(),
+                              KEY_READ);
     std::wstring wide_url;
     if (!sub_key.ReadValue(L"URL", &wide_url) || wide_url.empty()) {
       VLOG(1) << "No URL for IE search engine at " << key_iterator.Name();
@@ -425,7 +425,7 @@ void IEImporter::ImportHomepage() {
   const wchar_t kIEHomepage[] = L"Start Page";
   const wchar_t kIEDefaultHomepage[] = L"Default_Page_URL";
 
-  RegKey key(HKEY_CURRENT_USER, kIESettingsMain, KEY_READ);
+  base::win::RegKey key(HKEY_CURRENT_USER, kIESettingsMain, KEY_READ);
   std::wstring homepage_url;
   if (!key.ReadValue(kIEHomepage, &homepage_url) || homepage_url.empty())
     return;
@@ -435,7 +435,7 @@ void IEImporter::ImportHomepage() {
     return;
 
   // Check to see if this is the default website and skip import.
-  RegKey keyDefault(HKEY_LOCAL_MACHINE, kIESettingsMain, KEY_READ);
+  base::win::RegKey keyDefault(HKEY_LOCAL_MACHINE, kIESettingsMain, KEY_READ);
   std::wstring default_homepage_url;
   if (keyDefault.ReadValue(kIEDefaultHomepage, &default_homepage_url) &&
       !default_homepage_url.empty()) {
@@ -469,9 +469,8 @@ bool IEImporter::GetFavoritesInfo(IEImporter::FavoritesInfo *info) {
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     // The Link folder name is stored in the registry.
     DWORD buffer_length = sizeof(buffer);
-    RegKey reg_key(HKEY_CURRENT_USER,
-                   L"Software\\Microsoft\\Internet Explorer\\Toolbar",
-                   KEY_READ);
+    base::win::RegKey reg_key(HKEY_CURRENT_USER,
+        L"Software\\Microsoft\\Internet Explorer\\Toolbar", KEY_READ);
     if (!reg_key.ReadValue(L"LinksFolderName", buffer, &buffer_length, NULL))
       return false;
     info->links_folder = buffer;
@@ -579,8 +578,8 @@ int IEImporter::CurrentIEVersion() const {
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
-    RegKey reg_key(HKEY_LOCAL_MACHINE,
-                   L"Software\\Microsoft\\Internet Explorer", KEY_READ);
+    base::win::RegKey reg_key(HKEY_LOCAL_MACHINE,
+        L"Software\\Microsoft\\Internet Explorer", KEY_READ);
     bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = (result ? _wtoi(buffer) : 0);
   }