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

chrome/installer/setup/user_hive_visitor.cc

Index: chrome/installer/setup/user_hive_visitor.cc
diff --git a/chrome/installer/setup/user_hive_visitor.cc b/chrome/installer/setup/user_hive_visitor.cc
index e26f7c904fc67c3d5535eaff20aa0cc8bf4110e3..be813262c41f50a4f50990257e072d5e70b5378f 100644
--- a/chrome/installer/setup/user_hive_visitor.cc
+++ b/chrome/installer/setup/user_hive_visitor.cc
@@ -7,6 +7,7 @@
 #include <string>
 #include <utility>
 
+#include "base/base32.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ -19,7 +20,6 @@
 #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 {
 
@@ -53,7 +53,7 @@ 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(),