Move crypto files out of base, to a top level directory.

chrome/browser/sync/util/nigori.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/sync/util/nigori.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>  // for htonl
 #else
 #include <arpa/inet.h>
 #endif
 
 #include <sstream>
 #include <vector>
 
 #include "base/base64.h"
-#include "base/crypto/encryptor.h"
-#include "base/hmac.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
+#include "crypto/encryptor.h"
+#include "crypto/hmac.h"
 
 using base::Base64Encode;
 using base::Base64Decode;
-using base::Encryptor;
-using base::HMAC;
 using base::RandInt;
-using base::SymmetricKey;
+using crypto::Encryptor;
+using crypto::HMAC;
+using crypto::SymmetricKey;
 
 namespace browser_sync {
 
 // NigoriStream simplifies the concatenation operation of the Nigori protocol.
 class NigoriStream {
  public:
   // Append the big-endian representation of the length of |value| with 32 bits,
   // followed by |value| itself to the stream.
   NigoriStream& operator<<(const std::string& value) {
     uint32 size = htonl(value.size());
@@ skipping 212 matching lines @@
   DCHECK(user_key);
   DCHECK(encryption_key);
   DCHECK(mac_key);
 
   return user_key_->GetRawKey(user_key) &&
       encryption_key_->GetRawKey(encryption_key) &&
       mac_key_->GetRawKey(mac_key);
 }
 
 }  // namespace browser_sync