| Index: chrome/utility/importer/nss_decryptor.h
|
| diff --git a/chrome/browser/importer/nss_decryptor.h b/chrome/utility/importer/nss_decryptor.h
|
| similarity index 63%
|
| rename from chrome/browser/importer/nss_decryptor.h
|
| rename to chrome/utility/importer/nss_decryptor.h
|
| index a7284d6906954d085e6ac2d45d8b228e6a0139e4..d3d309cea7ee6eb48403a55a07653bf4adc66ab8 100644
|
| --- a/chrome/browser/importer/nss_decryptor.h
|
| +++ b/chrome/utility/importer/nss_decryptor.h
|
| @@ -2,24 +2,24 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_
|
| -#define CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_
|
| +#ifndef CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_
|
| +#define CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_
|
|
|
| #include "build/build_config.h"
|
|
|
| #if defined(OS_MACOSX)
|
| -#include "chrome/browser/importer/nss_decryptor_mac.h"
|
| +#include "chrome/utility/importer/nss_decryptor_mac.h"
|
| #elif defined(OS_WIN)
|
| -#include "chrome/browser/importer/nss_decryptor_win.h"
|
| +#include "chrome/utility/importer/nss_decryptor_win.h"
|
| #elif defined(USE_OPENSSL)
|
| // TODO(joth): It should be an error to include this file with USE_OPENSSL
|
| // defined. (Unless there is a way to do nss decrypt with OpenSSL). Ideally
|
| // we remove the importers that depend on NSS when doing USE_OPENSSL builds, but
|
| // that is going to take some non-trivial refactoring so in the meantime we're
|
| // just falling back to a no-op implementation.
|
| -#include "chrome/browser/importer/nss_decryptor_null.h"
|
| +#include "chrome/utility/importer/nss_decryptor_null.h"
|
| #elif defined(USE_NSS)
|
| -#include "chrome/browser/importer/nss_decryptor_system_nss.h"
|
| +#include "chrome/utility/importer/nss_decryptor_system_nss.h"
|
| #endif
|
|
|
| -#endif // CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_H_
|
| +#endif // CHROME_UTILITY_IMPORTER_NSS_DECRYPTOR_H_
|
|
|