Move base32 into base so that it can be used within base.

chrome/installer/setup/user_hive_visitor.cc

 // Copyright 2016 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/installer/setup/user_hive_visitor.h"
 
 #include <string>
 #include <utility>
 
+#include "base/base32.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/installer/setup/setup_util.h"
-#include "components/base32/base32.h"
 
 namespace installer {
 
 namespace {
 
 // A helper for loading and opening a hive into a random subkey of
 // HKEY_LOCAL_MACHINE.
 class ScopedUserHive {
  public:
   explicit ScopedUserHive(const base::FilePath& hive_file);
@@ skipping 13 matching lines @@
   // The loaded key.
   base::win::RegKey key_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedUserHive);
 };
 
 ScopedUserHive::ScopedUserHive(const base::FilePath& hive_file) {
   // Generate a random name for the key at which the file will be loaded.
   std::string buffer = base::RandBytesAsString(10);
   subkey_name_ = base::ASCIIToUTF16(
-      base32::Base32Encode(buffer, base32::Base32EncodePolicy::OMIT_PADDING));
+      base::Base32Encode(buffer, base::Base32EncodePolicy::OMIT_PADDING));
   DCHECK_EQ(16U, subkey_name_.size());
 
   LONG result = ::RegLoadKey(HKEY_LOCAL_MACHINE, subkey_name_.c_str(),
                              hive_file.value().c_str());
   if (result != ERROR_SUCCESS) {
     // Clear subkey_name_ since the load failed so that an unload will not be
     // attempted in the dtor.
     subkey_name_.clear();
     ::SetLastError(result);
     PLOG(ERROR) << "Failed loading user hive file \"" << hive_file.value()
@@ skipping 92 matching lines @@
     ScopedUserHive user_hive(hive_file);
     if (user_hive.valid()) {
       VLOG(1) << "Loaded and opened hive for sid \"" << sid << "\"";
       if (!visitor.Run(sid, user_hive.key()))
         break;
     }
   }
 }
 
 }  // namespace installer