| Index: chrome/browser/sync/util/user_settings.cc
|
| diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc
|
| index d49a071050f9806c18863b9cee38a64552479c92..ae544efee290b4556ee1be4fb88e5a0a8fa8451f 100644
|
| --- a/chrome/browser/sync/util/user_settings.cc
|
| +++ b/chrome/browser/sync/util/user_settings.cc
|
| @@ -1,4 +1,4 @@
|
| -// 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.
|
| //
|
| @@ -20,9 +20,10 @@
|
| #include "base/file_util.h"
|
| #include "base/string_util.h"
|
| #include "chrome/browser/sync/syncable/directory_manager.h" // For migration.
|
| -#include "chrome/browser/sync/util/crypto_helpers.h"
|
| #include "chrome/browser/sync/util/data_encryption.h"
|
| #include "chrome/common/sqlite_utils.h"
|
| +#include "crypto/md5_calculator.h"
|
| +#include "crypto/random.h"
|
|
|
| using std::numeric_limits;
|
| using std::string;
|
|
|