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

chrome/browser/safe_browsing/safe_browsing_util.cc

 // Copyright (c) 2006-2008 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/browser/safe_browsing/safe_browsing_util.h"
 
+#include "base/base64.h"
 #include "base/hmac.h"
 #include "base/logging.h"
 #include "base/sha2.h"
 #include "base/string_util.h"
 #include "chrome/browser/google_util.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/base64.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
 
 static const int kSafeBrowsingMacDigestSize = 20;
 
 // Continue to this URL after submitting the phishing report form.
 // TODO(paulg): Change to a Chrome specific URL.
 static const char kContinueUrlFormat[] =
   "http://www.google.com/tools/firefox/toolbar/FT2/intl/%s/submit_success.html";
 
@@ skipping 132 matching lines @@
         break;
     }
   }
 }
 
 bool VerifyMAC(const std::string& key, const std::string& mac,
                const char* data, int data_length) {
   std::string key_copy = key;
   DecodeWebSafe(&key_copy);
   std::string decoded_key;
-  net::Base64Decode(key_copy, &decoded_key);
+  base::Base64Decode(key_copy, &decoded_key);
 
   std::string mac_copy = mac;
   DecodeWebSafe(&mac_copy);
   std::string decoded_mac;
-  net::Base64Decode(mac_copy, &decoded_mac);
+  base::Base64Decode(mac_copy, &decoded_mac);
 
   base::HMAC hmac(base::HMAC::SHA1);
   if (!hmac.Init(decoded_key))
     return false;
   const std::string data_str(data, data_length);
   unsigned char digest[kSafeBrowsingMacDigestSize];
   if (!hmac.Sign(data_str, digest, kSafeBrowsingMacDigestSize))
     return false;
 
   return memcmp(digest, decoded_mac.data(), kSafeBrowsingMacDigestSize) == 0;
@@ skipping 448 matching lines @@
 
   // Validate that the next entry is wholly contained inside of |data_|.
   const char* end = data_.get() + size_;
   if (next + SBEntry::kMinSize <= end && next + next_entry->Size() <= end) {
     *entry = next_entry;
     return true;
   }
 
   return false;
 }