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

Side by Side Diff: chrome/utility/importer/firefox_importer_unittest.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright (c) 2012 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 "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h"
9 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
10 #include "chrome/utility/importer/firefox_importer_unittest_utils.h" 11 #include "chrome/utility/importer/firefox_importer_unittest_utils.h"
11 #include "chrome/utility/importer/nss_decryptor.h" 12 #include "chrome/utility/importer/nss_decryptor.h"
12 #include "sql/connection.h" 13 #include "sql/connection.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688 16 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
16 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) 17 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
17 #define MAYBE_NSS(x) DISABLED_##x 18 #define MAYBE_NSS(x) DISABLED_##x
18 #else 19 #else
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ASSERT_TRUE(decryptor_proxy.Setup(nss_path)); 107 ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
107 108
108 ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path)); 109 ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
109 std::vector<autofill::PasswordForm> forms = 110 std::vector<autofill::PasswordForm> forms =
110 decryptor_proxy.ParseSignons(signons_path); 111 decryptor_proxy.ParseSignons(signons_path);
111 112
112 ASSERT_EQ(2u, forms.size()); 113 ASSERT_EQ(2u, forms.size());
113 EXPECT_EQ(autofill::PasswordForm::SCHEME_BASIC, forms[0].scheme); 114 EXPECT_EQ(autofill::PasswordForm::SCHEME_BASIC, forms[0].scheme);
114 EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, forms[1].scheme); 115 EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, forms[1].scheme);
115 } 116 }
OLDNEW
« no previous file with comments | « chrome/utility/importer/firefox_importer.cc ('k') | chrome/utility/importer/firefox_importer_unittest_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698