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

base/base32_unittest.cc

Index: base/base32_unittest.cc
diff --git a/components/base32/base32_unittest.cc b/base/base32_unittest.cc
similarity index 82%
rename from components/base32/base32_unittest.cc
rename to base/base32_unittest.cc
index 350b61c96b8c1315fcf0d69604d6a697a4a34387..8e43d53c5c7e897ff832e0b208ede56cb3a68e39 100644
--- a/components/base32/base32_unittest.cc
+++ b/base/base32_unittest.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/base32.h"
+
 #include <string>
 
-#include "components/base32/base32.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace base32 {
+namespace base {
 namespace {
 
 TEST(Base32Test, EncodesRfcTestVectorsCorrectlyWithoutPadding) {
@@ -19,7 +20,7 @@ TEST(Base32Test, EncodesRfcTestVectorsCorrectlyWithoutPadding) {
 
   // Run the tests, with one more letter in the input every pass.
   for (size_t i = 0; i < arraysize(expected); ++i) {
-    std::string output = Base32Encode(base::StringPiece(test_str, i),
+    std::string output = Base32Encode(StringPiece(test_str, i),
                                       Base32EncodePolicy::OMIT_PADDING);
     EXPECT_EQ(expected[i], output);
   }
@@ -35,7 +36,7 @@ TEST(Base32Test, EncodesRfcTestVectorsCorrectlyWithPadding) {
 
   // Run the tests, with one more letter in the input every pass.
   for (size_t i = 0; i < arraysize(expected); ++i) {
-    std::string output = Base32Encode(base::StringPiece(test_str, i));
+    std::string output = Base32Encode(StringPiece(test_str, i));
     EXPECT_EQ(expected[i], output);
   }
 }
@@ -46,10 +47,10 @@ TEST(Base32Test, EncodesSha256HashCorrectly) {
   constexpr char hash[] =
       "\x1f\x25\xe1\xca\xba\x4f\xf9\xb8\x27\x24\x83\x0f\xca\x60\xe4\xc2\xbe\xa8"
       "\xc3\xa9\x44\x1c\x27\xb0\xb4\x3e\x6a\x96\x94\xc7\xb8\x04";
-  std::string output = Base32Encode(base::StringPiece(hash, 32),
-                                    Base32EncodePolicy::OMIT_PADDING);
+  std::string output =
+      Base32Encode(StringPiece(hash, 32), Base32EncodePolicy::OMIT_PADDING);
   EXPECT_EQ("D4S6DSV2J743QJZEQMH4UYHEYK7KRQ5JIQOCPMFUHZVJNFGHXACA", output);
 }
 
 }  // namespace
-}  // namespace base32
+}  // namespace base