summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/firefox3_importer.h
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 17:27:27 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 17:27:27 +0000
commitbe9551df15b9d5ebbc1e52cd736c1c95e38f1821 (patch)
tree3798c6d714a64d9aa921422faba1bb7d38ce3fdd /chrome/browser/importer/firefox3_importer.h
parente7760ea7123b355cd3a758b9833aac36093869d7 (diff)
downloadchromium_src-be9551df15b9d5ebbc1e52cd736c1c95e38f1821.zip
chromium_src-be9551df15b9d5ebbc1e52cd736c1c95e38f1821.tar.gz
chromium_src-be9551df15b9d5ebbc1e52cd736c1c95e38f1821.tar.bz2
Bring up Firefox Password Import Unittest on OS X.
The NSSDecrptor class needs to be run in a child process on OS X, so we need to do some fancy footwork in the form of a bridge class. Also a few small fixes for surrounding code. BUG=18775 TEST=none Review URL: http://codereview.chromium.org/174206 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox3_importer.h')
-rw-r--r--chrome/browser/importer/firefox3_importer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h
index 12a678f..9daa6b53a 100644
--- a/chrome/browser/importer/firefox3_importer.h
+++ b/chrome/browser/importer/firefox3_importer.h
@@ -80,7 +80,7 @@ class Firefox3Importer : public Importer {
std::wstring source_path_;
std::wstring app_path_;
- DISALLOW_EVIL_CONSTRUCTORS(Firefox3Importer);
+ DISALLOW_COPY_AND_ASSIGN(Firefox3Importer);
};
#endif // CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_