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

chrome/installer/util/shell_util.cc

Index: chrome/installer/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 948805a997dd5492123ba1d9e7642549023cb844..44b47d06139e072317106f279b090fb70dc0e67d 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -17,6 +17,7 @@
 #include <memory>
 #include <string>
 
+#include "base/base32.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ -57,7 +58,6 @@
 #include "chrome/installer/util/scoped_user_protocol_entry.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
-#include "components/base32/base32.h"
 
 using base::win::RegKey;
 
@@ -137,10 +137,10 @@ UserSpecificRegistrySuffix::UserSpecificRegistrySuffix() {
   base::MD5Digest md5_digest;
   std::string user_sid_ascii(base::UTF16ToASCII(user_sid));
   base::MD5Sum(user_sid_ascii.c_str(), user_sid_ascii.length(), &md5_digest);
-  std::string base32_md5 = base32::Base32Encode(
+  std::string base32_md5 = base::Base32Encode(
       base::StringPiece(reinterpret_cast<char*>(md5_digest.a),
                         arraysize(md5_digest.a)),
-      base32::Base32EncodePolicy::OMIT_PADDING);
+      base::Base32EncodePolicy::OMIT_PADDING);
   // The value returned by the base32 algorithm above must never change.
   DCHECK_EQ(base32_md5.length(), 26U);
   suffix_.reserve(base32_md5.length() + 1);