Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Side by Side Diff: sync/util/nigori.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/util/nigori.h ('k') | sync/util/nigori_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/util/nigori.h" 5 #include "sync/util/nigori.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/sys_byteorder.h" 14 #include "base/sys_byteorder.h"
15 #include "crypto/encryptor.h" 15 #include "crypto/encryptor.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 DCHECK(user_key); 247 DCHECK(user_key);
248 DCHECK(encryption_key); 248 DCHECK(encryption_key);
249 DCHECK(mac_key); 249 DCHECK(mac_key);
250 250
251 return user_key_->GetRawKey(user_key) && 251 return user_key_->GetRawKey(user_key) &&
252 encryption_key_->GetRawKey(encryption_key) && 252 encryption_key_->GetRawKey(encryption_key) &&
253 mac_key_->GetRawKey(mac_key); 253 mac_key_->GetRawKey(mac_key);
254 } 254 }
255 255
256 } // namespace browser_sync 256 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/util/nigori.h ('k') | sync/util/nigori_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698