Move base64 from 'net/base' into 'base'.

net/base/strict_transport_security_state.cc

 // Copyright (c) 2009 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 "net/base/strict_transport_security_state.h"
 
+#include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/sha2.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/base64.h"
 #include "net/base/dns_util.h"
 
 namespace net {
 
 StrictTransportSecurityState::StrictTransportSecurityState()
     : delegate_(NULL) {
 }
 
 void StrictTransportSecurityState::DidReceiveHeader(const GURL& url,
                                                     const std::string& value) {
@@ skipping 164 matching lines @@
     StrictTransportSecurityState::Delegate* delegate) {
   AutoLock lock(lock_);
 
   delegate_ = delegate;
 }
 
 // This function converts the binary hashes, which we store in
 // |enabled_hosts_|, to a base64 string which we can include in a JSON file.
 static std::wstring HashedDomainToExternalString(const std::string& hashed) {
   std::string out;
-  CHECK(Base64Encode(hashed, &out));
+  CHECK(base::Base64Encode(hashed, &out));
   return ASCIIToWide(out);
 }
 
 // This inverts |HashedDomainToExternalString|, above. It turns an external
 // string (from a JSON file) into an internal (binary) string.
 static std::string ExternalStringToHashedDomain(const std::wstring& external) {
   std::string external_ascii = WideToASCII(external);
   std::string out;
-  if (!Base64Decode(external_ascii, &out) ||
+  if (!base::Base64Decode(external_ascii, &out) ||
       out.size() != base::SHA256_LENGTH) {
     return std::string();
   }
 
   return out;
 }
 
 bool StrictTransportSecurityState::Serialise(std::string* output) {
   AutoLock lock(lock_);
 
@@ skipping 88 matching lines @@
     if (new_host[i + 1] == '-' ||
         new_host[i + label_length] == '-') {
       return std::string();
     }
   }
 
   return new_host;
 }
 
 }  // namespace