| OLD | NEW |
| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 { | 219 { |
| 220 sql::Connection connection; | 220 sql::Connection connection; |
| 221 ASSERT_TRUE(connection.Open(GetDatabasePath())); | 221 ASSERT_TRUE(connection.Open(GetDatabasePath())); |
| 222 | 222 |
| 223 // Check version. | 223 // Check version. |
| 224 EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection)); | 224 EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection)); |
| 225 | 225 |
| 226 // Check that expected tables are present. | 226 // Check that expected tables are present. |
| 227 EXPECT_TRUE(connection.DoesTableExist("meta")); | 227 EXPECT_TRUE(connection.DoesTableExist("meta")); |
| 228 EXPECT_TRUE(connection.DoesTableExist("keywords")); | 228 EXPECT_TRUE(connection.DoesTableExist("keywords")); |
| 229 EXPECT_TRUE(connection.DoesTableExist("logins")); | 229 EXPECT_FALSE(connection.DoesTableExist("logins")); // This one is obsolete. |
| 230 EXPECT_TRUE(connection.DoesTableExist("web_app_icons")); | 230 EXPECT_TRUE(connection.DoesTableExist("web_app_icons")); |
| 231 EXPECT_TRUE(connection.DoesTableExist("web_apps")); | 231 EXPECT_TRUE(connection.DoesTableExist("web_apps")); |
| 232 EXPECT_TRUE(connection.DoesTableExist("autofill")); | 232 EXPECT_TRUE(connection.DoesTableExist("autofill")); |
| 233 EXPECT_TRUE(connection.DoesTableExist("autofill_dates")); | 233 EXPECT_TRUE(connection.DoesTableExist("autofill_dates")); |
| 234 EXPECT_TRUE(connection.DoesTableExist("autofill_profiles")); | 234 EXPECT_TRUE(connection.DoesTableExist("autofill_profiles")); |
| 235 EXPECT_TRUE(connection.DoesTableExist("credit_cards")); | 235 EXPECT_TRUE(connection.DoesTableExist("credit_cards")); |
| 236 EXPECT_TRUE(connection.DoesTableExist("token_service")); | 236 EXPECT_TRUE(connection.DoesTableExist("token_service")); |
| 237 } | 237 } |
| 238 } | 238 } |
| 239 | 239 |
| (...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1928 &default_search_provider_id_backup)); | 1928 &default_search_provider_id_backup)); |
| 1929 // Backup ID must be updated to match the old default search provider ID. | 1929 // Backup ID must be updated to match the old default search provider ID. |
| 1930 EXPECT_EQ(default_search_provider_id, default_search_provider_id_backup); | 1930 EXPECT_EQ(default_search_provider_id, default_search_provider_id_backup); |
| 1931 | 1931 |
| 1932 std::string default_search_provider_id_backup_signature; | 1932 std::string default_search_provider_id_backup_signature; |
| 1933 EXPECT_TRUE(meta_table.GetValue(KeywordTable::kBackupSignatureKey, | 1933 EXPECT_TRUE(meta_table.GetValue(KeywordTable::kBackupSignatureKey, |
| 1934 &default_search_provider_id_backup_signature)); | 1934 &default_search_provider_id_backup_signature)); |
| 1935 EXPECT_FALSE(default_search_provider_id_backup_signature.empty()); | 1935 EXPECT_FALSE(default_search_provider_id_backup_signature.empty()); |
| 1936 } | 1936 } |
| 1937 } | 1937 } |
| OLD | NEW |