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

Side by Side Diff: chrome/browser/history/android/android_provider_backend_unittest.cc

Issue 10870029: Remove legacy migration code that coupled history and bookmarks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More android fixes. Created 8 years, 3 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 | Annotate | Revision Log
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 "chrome/browser/history/android/android_provider_backend.h" 5 #include "chrome/browser/history/android/android_provider_backend.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ASSERT_TRUE(bookmark_model_); 136 ASSERT_TRUE(bookmark_model_);
137 137
138 // Setup the database directory and files. 138 // Setup the database directory and files.
139 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 139 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
140 140
141 history_db_name_ = temp_dir_.path().AppendASCII(chrome::kHistoryFilename); 141 history_db_name_ = temp_dir_.path().AppendASCII(chrome::kHistoryFilename);
142 thumbnail_db_name_ = temp_dir_.path().AppendASCII( 142 thumbnail_db_name_ = temp_dir_.path().AppendASCII(
143 chrome::kFaviconsFilename); 143 chrome::kFaviconsFilename);
144 android_cache_db_name_ = temp_dir_.path().AppendASCII( 144 android_cache_db_name_ = temp_dir_.path().AppendASCII(
145 "TestAndroidCache.db"); 145 "TestAndroidCache.db");
146 bookmark_temp_ = temp_dir_.path().AppendASCII("bookmark_temp");
147 ASSERT_TRUE(file_util::CreateDirectory(bookmark_temp_));
148 } 146 }
149 147
150 void AddBookmark(const GURL& url) { 148 void AddBookmark(const GURL& url) {
151 const BookmarkNode* mobile_node = bookmark_model_->mobile_node(); 149 const BookmarkNode* mobile_node = bookmark_model_->mobile_node();
152 ASSERT_TRUE(mobile_node); 150 ASSERT_TRUE(mobile_node);
153 ASSERT_TRUE(bookmark_model_->AddURL(mobile_node, 0, string16(), url)); 151 ASSERT_TRUE(bookmark_model_->AddURL(mobile_node, 0, string16(), url));
154 } 152 }
155 153
156 bool GetAndroidURLsRows(std::vector<AndroidURLRow>* rows, 154 bool GetAndroidURLsRows(std::vector<AndroidURLRow>* rows,
157 AndroidProviderBackend* backend) { 155 AndroidProviderBackend* backend) {
(...skipping 29 matching lines...) Expand all
187 } 185 }
188 186
189 AndroidProviderBackendDelegate delegate_; 187 AndroidProviderBackendDelegate delegate_;
190 scoped_refptr<HistoryBackend> history_backend_; 188 scoped_refptr<HistoryBackend> history_backend_;
191 HistoryDatabase history_db_; 189 HistoryDatabase history_db_;
192 ThumbnailDatabase thumbnail_db_; 190 ThumbnailDatabase thumbnail_db_;
193 ScopedTempDir temp_dir_; 191 ScopedTempDir temp_dir_;
194 FilePath android_cache_db_name_; 192 FilePath android_cache_db_name_;
195 FilePath history_db_name_; 193 FilePath history_db_name_;
196 FilePath thumbnail_db_name_; 194 FilePath thumbnail_db_name_;
197 FilePath bookmark_temp_;
198 195
199 TestingProfileManager profile_manager_; 196 TestingProfileManager profile_manager_;
200 BookmarkModel* bookmark_model_; 197 BookmarkModel* bookmark_model_;
201 MessageLoopForUI message_loop_; 198 MessageLoopForUI message_loop_;
202 content::TestBrowserThread ui_thread_; 199 content::TestBrowserThread ui_thread_;
203 content::TestBrowserThread file_thread_; 200 content::TestBrowserThread file_thread_;
204 201
205 202
206 DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendTest); 203 DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendTest);
207 }; 204 };
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 new base::RefCountedBytes(data), 253 new base::RefCountedBytes(data),
257 FAVICON); 254 FAVICON);
258 history_backend->Closing(); 255 history_backend->Closing();
259 } 256 }
260 257
261 // The history_db_name and thumbnail_db_name files should be created by 258 // The history_db_name and thumbnail_db_name files should be created by
262 // HistoryBackend. We need to open the same database files. 259 // HistoryBackend. We need to open the same database files.
263 ASSERT_TRUE(file_util::PathExists(history_db_name_)); 260 ASSERT_TRUE(file_util::PathExists(history_db_name_));
264 ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_)); 261 ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
265 262
266 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 263 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
267 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 264 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
268 &history_db_)); 265 &history_db_));
269 // Set url1 as bookmark. 266 // Set url1 as bookmark.
270 AddBookmark(url1); 267 AddBookmark(url1);
271 scoped_ptr<AndroidProviderBackend> backend( 268 scoped_ptr<AndroidProviderBackend> backend(
272 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 269 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
273 &thumbnail_db_, bookmark_model_, &delegate_)); 270 &thumbnail_db_, bookmark_model_, &delegate_));
274 271
275 ASSERT_TRUE(backend->EnsureInitializedAndUpdated()); 272 ASSERT_TRUE(backend->EnsureInitializedAndUpdated());
276 273
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 new base::RefCountedBytes(data), 399 new base::RefCountedBytes(data),
403 FAVICON); 400 FAVICON);
404 history_backend->Closing(); 401 history_backend->Closing();
405 } 402 }
406 403
407 // The history_db_name and thumbnail_db_name files should be created by 404 // The history_db_name and thumbnail_db_name files should be created by
408 // HistoryBackend. We need to open the same database files. 405 // HistoryBackend. We need to open the same database files.
409 ASSERT_TRUE(file_util::PathExists(history_db_name_)); 406 ASSERT_TRUE(file_util::PathExists(history_db_name_));
410 ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_)); 407 ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
411 408
412 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 409 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
413 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 410 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
414 &history_db_)); 411 &history_db_));
415 // Set url1 as bookmark. 412 // Set url1 as bookmark.
416 AddBookmark(url1); 413 AddBookmark(url1);
417 414
418 scoped_ptr<AndroidProviderBackend> backend( 415 scoped_ptr<AndroidProviderBackend> backend(
419 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 416 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
420 &thumbnail_db_, bookmark_model_, &delegate_)); 417 &thumbnail_db_, bookmark_model_, &delegate_));
421 418
422 std::vector<HistoryAndBookmarkRow::ColumnID> projections; 419 std::vector<HistoryAndBookmarkRow::ColumnID> projections;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 HistoryAndBookmarkRow row2; 489 HistoryAndBookmarkRow row2;
493 row2.set_raw_url("http://www.example.com"); 490 row2.set_raw_url("http://www.example.com");
494 row2.set_url(GURL("http://www.example.com")); 491 row2.set_url(GURL("http://www.example.com"));
495 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 492 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
496 row2.set_is_bookmark(false); 493 row2.set_is_bookmark(false);
497 row2.set_title(UTF8ToUTF16("example")); 494 row2.set_title(UTF8ToUTF16("example"));
498 std::vector<unsigned char> data; 495 std::vector<unsigned char> data;
499 data.push_back('1'); 496 data.push_back('1');
500 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 497 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
501 498
502 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 499 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
503 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 500 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
504 &history_db_)); 501 &history_db_));
505 scoped_ptr<AndroidProviderBackend> backend( 502 scoped_ptr<AndroidProviderBackend> backend(
506 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 503 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
507 &thumbnail_db_, bookmark_model_, &delegate_)); 504 &thumbnail_db_, bookmark_model_, &delegate_));
508 505
509 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1)); 506 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
510 EXPECT_FALSE(delegate_.deleted_details()); 507 EXPECT_FALSE(delegate_.deleted_details());
511 ASSERT_TRUE(delegate_.modified_details()); 508 ASSERT_TRUE(delegate_.modified_details());
512 ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size()); 509 ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 HistoryAndBookmarkRow row2; 598 HistoryAndBookmarkRow row2;
602 row2.set_raw_url("http://www.example.com"); 599 row2.set_raw_url("http://www.example.com");
603 row2.set_url(GURL("http://www.example.com")); 600 row2.set_url(GURL("http://www.example.com"));
604 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 601 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
605 row2.set_is_bookmark(false); 602 row2.set_is_bookmark(false);
606 row2.set_title(UTF8ToUTF16("example")); 603 row2.set_title(UTF8ToUTF16("example"));
607 std::vector<unsigned char> data; 604 std::vector<unsigned char> data;
608 data.push_back('1'); 605 data.push_back('1');
609 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 606 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
610 607
611 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 608 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
612 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 609 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
613 &history_db_)); 610 &history_db_));
614 611
615 scoped_ptr<AndroidProviderBackend> backend( 612 scoped_ptr<AndroidProviderBackend> backend(
616 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 613 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
617 &thumbnail_db_, bookmark_model_, &delegate_)); 614 &thumbnail_db_, bookmark_model_, &delegate_));
618 615
619 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1)); 616 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
620 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2)); 617 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
621 // Verify the row1 has been added in bookmark model. 618 // Verify the row1 has been added in bookmark model.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 delegate_.favicon_details()->urls.find(row2.url())); 696 delegate_.favicon_details()->urls.find(row2.url()));
700 697
701 ASSERT_EQ(1, deleted_count); 698 ASSERT_EQ(1, deleted_count);
702 scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks( 699 scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks(
703 projections, std::string(), std::vector<string16>(), 700 projections, std::string(), std::vector<string16>(),
704 std::string("url ASC"))); 701 std::string("url ASC")));
705 ASSERT_FALSE(statement1->statement()->Step()); 702 ASSERT_FALSE(statement1->statement()->Step());
706 } 703 }
707 704
708 TEST_F(AndroidProviderBackendTest, IsValidHistoryAndBookmarkRow) { 705 TEST_F(AndroidProviderBackendTest, IsValidHistoryAndBookmarkRow) {
709 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 706 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
710 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 707 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
711 &history_db_)); 708 &history_db_));
712 scoped_ptr<AndroidProviderBackend> backend( 709 scoped_ptr<AndroidProviderBackend> backend(
713 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 710 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
714 &thumbnail_db_, bookmark_model_, &delegate_)); 711 &thumbnail_db_, bookmark_model_, &delegate_));
715 712
716 // The created time and last visit time are too close to have required visit 713 // The created time and last visit time are too close to have required visit
717 // count. 714 // count.
718 HistoryAndBookmarkRow row1; 715 HistoryAndBookmarkRow row1;
719 row1.set_raw_url("cnn.com"); 716 row1.set_raw_url("cnn.com");
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 HistoryAndBookmarkRow row2; 787 HistoryAndBookmarkRow row2;
791 row2.set_raw_url("http://www.example.com"); 788 row2.set_raw_url("http://www.example.com");
792 row2.set_url(GURL("http://www.example.com")); 789 row2.set_url(GURL("http://www.example.com"));
793 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 790 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
794 row2.set_is_bookmark(false); 791 row2.set_is_bookmark(false);
795 row2.set_title(UTF8ToUTF16("example")); 792 row2.set_title(UTF8ToUTF16("example"));
796 std::vector<unsigned char> data; 793 std::vector<unsigned char> data;
797 data.push_back('1'); 794 data.push_back('1');
798 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 795 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
799 796
800 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 797 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
801 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 798 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
802 &history_db_)); 799 &history_db_));
803 scoped_ptr<AndroidProviderBackend> backend( 800 scoped_ptr<AndroidProviderBackend> backend(
804 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 801 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
805 &thumbnail_db_, bookmark_model_, &delegate_)); 802 &thumbnail_db_, bookmark_model_, &delegate_));
806 803
807 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1); 804 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
808 ASSERT_TRUE(id1); 805 ASSERT_TRUE(id1);
809 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2); 806 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
810 ASSERT_TRUE(id2); 807 ASSERT_TRUE(id2);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 HistoryAndBookmarkRow row2; 967 HistoryAndBookmarkRow row2;
971 row2.set_raw_url("http://www.example.com"); 968 row2.set_raw_url("http://www.example.com");
972 row2.set_url(GURL("http://www.example.com")); 969 row2.set_url(GURL("http://www.example.com"));
973 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 970 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
974 row2.set_is_bookmark(false); 971 row2.set_is_bookmark(false);
975 row2.set_title(UTF8ToUTF16("example")); 972 row2.set_title(UTF8ToUTF16("example"));
976 std::vector<unsigned char> data; 973 std::vector<unsigned char> data;
977 data.push_back('1'); 974 data.push_back('1');
978 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 975 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
979 976
980 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 977 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
981 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 978 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
982 &history_db_)); 979 &history_db_));
983 scoped_ptr<AndroidProviderBackend> backend( 980 scoped_ptr<AndroidProviderBackend> backend(
984 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 981 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
985 &thumbnail_db_, bookmark_model_, &delegate_)); 982 &thumbnail_db_, bookmark_model_, &delegate_));
986 983
987 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1); 984 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
988 ASSERT_TRUE(id1); 985 ASSERT_TRUE(id1);
989 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2); 986 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
990 ASSERT_TRUE(id2); 987 ASSERT_TRUE(id2);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 HistoryAndBookmarkRow row2; 1048 HistoryAndBookmarkRow row2;
1052 row2.set_raw_url("http://www.example.com"); 1049 row2.set_raw_url("http://www.example.com");
1053 row2.set_url(GURL("http://www.example.com")); 1050 row2.set_url(GURL("http://www.example.com"));
1054 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 1051 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
1055 row2.set_is_bookmark(false); 1052 row2.set_is_bookmark(false);
1056 row2.set_title(UTF8ToUTF16("example")); 1053 row2.set_title(UTF8ToUTF16("example"));
1057 std::vector<unsigned char> data; 1054 std::vector<unsigned char> data;
1058 data.push_back('1'); 1055 data.push_back('1');
1059 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 1056 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
1060 1057
1061 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1058 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1062 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1059 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1063 &history_db_)); 1060 &history_db_));
1064 scoped_ptr<AndroidProviderBackend> backend( 1061 scoped_ptr<AndroidProviderBackend> backend(
1065 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1062 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1066 &thumbnail_db_, bookmark_model_, &delegate_)); 1063 &thumbnail_db_, bookmark_model_, &delegate_));
1067 1064
1068 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1); 1065 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
1069 ASSERT_TRUE(id1); 1066 ASSERT_TRUE(id1);
1070 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2); 1067 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
1071 ASSERT_TRUE(id2); 1068 ASSERT_TRUE(id2);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 TEST_F(AndroidProviderBackendTest, UpdateFavicon) { 1110 TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
1114 HistoryAndBookmarkRow row1; 1111 HistoryAndBookmarkRow row1;
1115 row1.set_raw_url("cnn.com"); 1112 row1.set_raw_url("cnn.com");
1116 row1.set_url(GURL("http://cnn.com")); 1113 row1.set_url(GURL("http://cnn.com"));
1117 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1114 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
1118 row1.set_created(Time::Now() - TimeDelta::FromDays(20)); 1115 row1.set_created(Time::Now() - TimeDelta::FromDays(20));
1119 row1.set_visit_count(10); 1116 row1.set_visit_count(10);
1120 row1.set_is_bookmark(true); 1117 row1.set_is_bookmark(true);
1121 row1.set_title(UTF8ToUTF16("cnn")); 1118 row1.set_title(UTF8ToUTF16("cnn"));
1122 1119
1123 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1120 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1124 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1121 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1125 &history_db_)); 1122 &history_db_));
1126 scoped_ptr<AndroidProviderBackend> backend( 1123 scoped_ptr<AndroidProviderBackend> backend(
1127 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1124 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1128 &thumbnail_db_, bookmark_model_, &delegate_)); 1125 &thumbnail_db_, bookmark_model_, &delegate_));
1129 1126
1130 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1); 1127 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
1131 ASSERT_TRUE(id1); 1128 ASSERT_TRUE(id1);
1132 1129
1133 int update_count; 1130 int update_count;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 ASSERT_TRUE(delegate_.favicon_details()); 1176 ASSERT_TRUE(delegate_.favicon_details());
1180 ASSERT_EQ(1u, delegate_.favicon_details()->urls.size()); 1177 ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
1181 ASSERT_TRUE(delegate_.favicon_details()->urls.end() != 1178 ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
1182 delegate_.favicon_details()->urls.find(row1.url())); 1179 delegate_.favicon_details()->urls.find(row1.url()));
1183 1180
1184 EXPECT_FALSE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON, 1181 EXPECT_FALSE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
1185 NULL)); 1182 NULL));
1186 } 1183 }
1187 1184
1188 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) { 1185 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {
1189 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1186 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1190 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1187 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1191 &history_db_)); 1188 &history_db_));
1192 scoped_ptr<AndroidProviderBackend> backend( 1189 scoped_ptr<AndroidProviderBackend> backend(
1193 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1190 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1194 &thumbnail_db_, bookmark_model_, &delegate_)); 1191 &thumbnail_db_, bookmark_model_, &delegate_));
1195 // Insert a keyword search item to verify if the update succeeds. 1192 // Insert a keyword search item to verify if the update succeeds.
1196 HistoryAndBookmarkRow row1; 1193 HistoryAndBookmarkRow row1;
1197 row1.set_raw_url("cnn.com"); 1194 row1.set_raw_url("cnn.com");
1198 row1.set_url(GURL("http://cnn.com")); 1195 row1.set_url(GURL("http://cnn.com"));
1199 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1196 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 // Remove the term. 1255 // Remove the term.
1259 ASSERT_TRUE(history_db_.DeleteKeywordSearchTerm(term)); 1256 ASSERT_TRUE(history_db_.DeleteKeywordSearchTerm(term));
1260 ASSERT_TRUE(backend->UpdateSearchTermTable()); 1257 ASSERT_TRUE(backend->UpdateSearchTermTable());
1261 // The cache of term should removed. 1258 // The cache of term should removed.
1262 ASSERT_FALSE(history_db_.GetSearchTerm(term, NULL)); 1259 ASSERT_FALSE(history_db_.GetSearchTerm(term, NULL));
1263 // The id of term2 wasn't changed. 1260 // The id of term2 wasn't changed.
1264 EXPECT_EQ(id2, history_db_.GetSearchTerm(term2, NULL)); 1261 EXPECT_EQ(id2, history_db_.GetSearchTerm(term2, NULL));
1265 } 1262 }
1266 1263
1267 TEST_F(AndroidProviderBackendTest, QuerySearchTerms) { 1264 TEST_F(AndroidProviderBackendTest, QuerySearchTerms) {
1268 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1265 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1269 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1266 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1270 &history_db_)); 1267 &history_db_));
1271 scoped_ptr<AndroidProviderBackend> backend( 1268 scoped_ptr<AndroidProviderBackend> backend(
1272 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1269 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1273 &thumbnail_db_, bookmark_model_, &delegate_)); 1270 &thumbnail_db_, bookmark_model_, &delegate_));
1274 // Insert a keyword search item to verify if we can find it. 1271 // Insert a keyword search item to verify if we can find it.
1275 HistoryAndBookmarkRow row1; 1272 HistoryAndBookmarkRow row1;
1276 row1.set_raw_url("cnn.com"); 1273 row1.set_raw_url("cnn.com");
1277 row1.set_url(GURL("http://cnn.com")); 1274 row1.set_url(GURL("http://cnn.com"));
1278 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1275 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
(...skipping 13 matching lines...) Expand all
1292 ASSERT_TRUE(statement.get()); 1289 ASSERT_TRUE(statement.get());
1293 ASSERT_TRUE(statement->statement()->Step()); 1290 ASSERT_TRUE(statement->statement()->Step());
1294 EXPECT_TRUE(statement->statement()->ColumnInt64(0)); 1291 EXPECT_TRUE(statement->statement()->ColumnInt64(0));
1295 EXPECT_EQ(term, statement->statement()->ColumnString16(1)); 1292 EXPECT_EQ(term, statement->statement()->ColumnString16(1));
1296 EXPECT_EQ(ToDatabaseTime(row1.last_visit_time()), 1293 EXPECT_EQ(ToDatabaseTime(row1.last_visit_time()),
1297 statement->statement()->ColumnInt64(2)); 1294 statement->statement()->ColumnInt64(2));
1298 EXPECT_FALSE(statement->statement()->Step()); 1295 EXPECT_FALSE(statement->statement()->Step());
1299 } 1296 }
1300 1297
1301 TEST_F(AndroidProviderBackendTest, UpdateSearchTerms) { 1298 TEST_F(AndroidProviderBackendTest, UpdateSearchTerms) {
1302 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1299 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1303 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1300 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1304 &history_db_)); 1301 &history_db_));
1305 scoped_ptr<AndroidProviderBackend> backend( 1302 scoped_ptr<AndroidProviderBackend> backend(
1306 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1303 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1307 &thumbnail_db_, bookmark_model_, &delegate_)); 1304 &thumbnail_db_, bookmark_model_, &delegate_));
1308 // Insert a keyword. 1305 // Insert a keyword.
1309 HistoryAndBookmarkRow row1; 1306 HistoryAndBookmarkRow row1;
1310 row1.set_raw_url("cnn.com"); 1307 row1.set_raw_url("cnn.com");
1311 row1.set_url(GURL("http://cnn.com")); 1308 row1.set_url(GURL("http://cnn.com"));
1312 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1309 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 EXPECT_EQ(id, statement->statement()->ColumnInt64(0)); 1394 EXPECT_EQ(id, statement->statement()->ColumnInt64(0));
1398 // The search time was updated. 1395 // The search time was updated.
1399 EXPECT_EQ(ToDatabaseTime(update_time.search_time()), 1396 EXPECT_EQ(ToDatabaseTime(update_time.search_time()),
1400 statement->statement()->ColumnInt64(1)); 1397 statement->statement()->ColumnInt64(1));
1401 // The search term didn't change. 1398 // The search term didn't change.
1402 EXPECT_EQ(update_term, statement->statement()->ColumnString16(2)); 1399 EXPECT_EQ(update_term, statement->statement()->ColumnString16(2));
1403 EXPECT_FALSE(statement->statement()->Step()); 1400 EXPECT_FALSE(statement->statement()->Step());
1404 } 1401 }
1405 1402
1406 TEST_F(AndroidProviderBackendTest, DeleteSearchTerms) { 1403 TEST_F(AndroidProviderBackendTest, DeleteSearchTerms) {
1407 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1404 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1408 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1405 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1409 &history_db_)); 1406 &history_db_));
1410 scoped_ptr<AndroidProviderBackend> backend( 1407 scoped_ptr<AndroidProviderBackend> backend(
1411 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1408 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1412 &thumbnail_db_, bookmark_model_, &delegate_)); 1409 &thumbnail_db_, bookmark_model_, &delegate_));
1413 // Insert a keyword. 1410 // Insert a keyword.
1414 HistoryAndBookmarkRow row1; 1411 HistoryAndBookmarkRow row1;
1415 row1.set_raw_url("cnn.com"); 1412 row1.set_raw_url("cnn.com");
1416 row1.set_url(GURL("http://cnn.com")); 1413 row1.set_url(GURL("http://cnn.com"));
1417 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1414 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 // Verify the second one was removed. 1501 // Verify the second one was removed.
1505 args.clear(); 1502 args.clear();
1506 args.push_back(UTF8ToUTF16(oss1.str())); 1503 args.push_back(UTF8ToUTF16(oss1.str()));
1507 statement.reset(backend->QuerySearchTerms(projections, "_id = ?", args, 1504 statement.reset(backend->QuerySearchTerms(projections, "_id = ?", args,
1508 std::string())); 1505 std::string()));
1509 ASSERT_TRUE(statement.get()); 1506 ASSERT_TRUE(statement.get());
1510 EXPECT_FALSE(statement->statement()->Step()); 1507 EXPECT_FALSE(statement->statement()->Step());
1511 } 1508 }
1512 1509
1513 TEST_F(AndroidProviderBackendTest, InsertSearchTerm) { 1510 TEST_F(AndroidProviderBackendTest, InsertSearchTerm) {
1514 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1511 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1515 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1512 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1516 &history_db_)); 1513 &history_db_));
1517 scoped_ptr<AndroidProviderBackend> backend( 1514 scoped_ptr<AndroidProviderBackend> backend(
1518 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1515 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1519 &thumbnail_db_, bookmark_model_, &delegate_)); 1516 &thumbnail_db_, bookmark_model_, &delegate_));
1520 SearchRow search_row; 1517 SearchRow search_row;
1521 search_row.set_search_term(UTF8ToUTF16("google")); 1518 search_row.set_search_term(UTF8ToUTF16("google"));
1522 search_row.set_url(GURL("http://google.com")); 1519 search_row.set_url(GURL("http://google.com"));
1523 search_row.set_template_url_id(1); 1520 search_row.set_template_url_id(1);
1524 search_row.set_search_time(Time::Now() - TimeDelta::FromHours(1)); 1521 search_row.set_search_time(Time::Now() - TimeDelta::FromHours(1));
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 HistoryAndBookmarkRow row2; 1556 HistoryAndBookmarkRow row2;
1560 row2.set_raw_url("http://www.example.com"); 1557 row2.set_raw_url("http://www.example.com");
1561 row2.set_url(GURL("http://www.example.com")); 1558 row2.set_url(GURL("http://www.example.com"));
1562 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10)); 1559 row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
1563 row2.set_is_bookmark(false); 1560 row2.set_is_bookmark(false);
1564 row2.set_title(UTF8ToUTF16("example")); 1561 row2.set_title(UTF8ToUTF16("example"));
1565 std::vector<unsigned char> data; 1562 std::vector<unsigned char> data;
1566 data.push_back('1'); 1563 data.push_back('1');
1567 row2.set_favicon(base::RefCountedBytes::TakeVector(&data)); 1564 row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
1568 1565
1569 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1566 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1570 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1567 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1571 &history_db_)); 1568 &history_db_));
1572 scoped_ptr<AndroidProviderBackend> backend( 1569 scoped_ptr<AndroidProviderBackend> backend(
1573 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1570 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1574 &thumbnail_db_, bookmark_model_, &delegate_)); 1571 &thumbnail_db_, bookmark_model_, &delegate_));
1575 1572
1576 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1); 1573 AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
1577 ASSERT_TRUE(id1); 1574 ASSERT_TRUE(id1);
1578 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2); 1575 AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
1579 ASSERT_TRUE(id2); 1576 ASSERT_TRUE(id2);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1612 ASSERT_TRUE(delegate_.deleted_details()); 1609 ASSERT_TRUE(delegate_.deleted_details());
1613 ASSERT_EQ(2u, delegate_.deleted_details()->rows.size()); 1610 ASSERT_EQ(2u, delegate_.deleted_details()->rows.size());
1614 EXPECT_EQ(row1.url(), 1611 EXPECT_EQ(row1.url(),
1615 delegate_.modified_details()->changed_urls[0].url()); 1612 delegate_.modified_details()->changed_urls[0].url());
1616 EXPECT_EQ(Time::UnixEpoch(), 1613 EXPECT_EQ(Time::UnixEpoch(),
1617 delegate_.modified_details()->changed_urls[0].last_visit()); 1614 delegate_.modified_details()->changed_urls[0].last_visit());
1618 EXPECT_EQ(1u, delegate_.favicon_details()->urls.size()); 1615 EXPECT_EQ(1u, delegate_.favicon_details()->urls.size());
1619 } 1616 }
1620 1617
1621 TEST_F(AndroidProviderBackendTest, TestMultipleNestingTransaction) { 1618 TEST_F(AndroidProviderBackendTest, TestMultipleNestingTransaction) {
1622 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1619 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1623 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1620 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1624 &history_db_)); 1621 &history_db_));
1625 scoped_ptr<AndroidProviderBackend> backend( 1622 scoped_ptr<AndroidProviderBackend> backend(
1626 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1623 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1627 &thumbnail_db_, bookmark_model_, &delegate_)); 1624 &thumbnail_db_, bookmark_model_, &delegate_));
1628 1625
1629 // Create the nested transactions. 1626 // Create the nested transactions.
1630 history_db_.BeginTransaction(); 1627 history_db_.BeginTransaction();
1631 history_db_.BeginTransaction(); 1628 history_db_.BeginTransaction();
1632 history_db_.BeginTransaction(); 1629 history_db_.BeginTransaction();
(...skipping 30 matching lines...) Expand all
1663 row2.set_is_bookmark(false); 1660 row2.set_is_bookmark(false);
1664 row2.set_title(UTF8ToUTF16("example")); 1661 row2.set_title(UTF8ToUTF16("example"));
1665 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2)); 1662 ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
1666 EXPECT_EQ(history_transaction, history_db_.transaction_nesting()); 1663 EXPECT_EQ(history_transaction, history_db_.transaction_nesting());
1667 EXPECT_EQ(thumbnail_transaction, thumbnail_db_.transaction_nesting()); 1664 EXPECT_EQ(thumbnail_transaction, thumbnail_db_.transaction_nesting());
1668 } 1665 }
1669 1666
1670 TEST_F(AndroidProviderBackendTest, TestAndroidCTSComplianceForZeroVisitCount) { 1667 TEST_F(AndroidProviderBackendTest, TestAndroidCTSComplianceForZeroVisitCount) {
1671 // This is to verify the last visit time and created time are same when visit 1668 // This is to verify the last visit time and created time are same when visit
1672 // count is 0. 1669 // count is 0.
1673 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1670 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1674 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1671 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1675 &history_db_)); 1672 &history_db_));
1676 scoped_ptr<AndroidProviderBackend> backend( 1673 scoped_ptr<AndroidProviderBackend> backend(
1677 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1674 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1678 &thumbnail_db_, bookmark_model_, &delegate_)); 1675 &thumbnail_db_, bookmark_model_, &delegate_));
1679 URLRow url_row(GURL("http://www.google.com")); 1676 URLRow url_row(GURL("http://www.google.com"));
1680 url_row.set_last_visit(Time::Now()); 1677 url_row.set_last_visit(Time::Now());
1681 url_row.set_visit_count(0); 1678 url_row.set_visit_count(0);
1682 history_db_.AddURL(url_row); 1679 history_db_.AddURL(url_row);
1683 1680
(...skipping 17 matching lines...) Expand all
1701 statement->statement()->ColumnInt64(3)); 1698 statement->statement()->ColumnInt64(3));
1702 EXPECT_EQ(ToDatabaseTime(url_row.last_visit()), 1699 EXPECT_EQ(ToDatabaseTime(url_row.last_visit()),
1703 statement->statement()->ColumnInt64(4)); 1700 statement->statement()->ColumnInt64(4));
1704 EXPECT_EQ(url_row.visit_count(), statement->statement()->ColumnInt(5)); 1701 EXPECT_EQ(url_row.visit_count(), statement->statement()->ColumnInt(5));
1705 } 1702 }
1706 1703
1707 TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) { 1704 TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) {
1708 // This is test is used to verify the 'folder' column exists, all bookmarks 1705 // This is test is used to verify the 'folder' column exists, all bookmarks
1709 // returned when folder is 0 and the non bookmark rows returned when folder 1706 // returned when folder is 0 and the non bookmark rows returned when folder
1710 // is 1. 1707 // is 1.
1711 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_)); 1708 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
1712 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL, 1709 ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
1713 &history_db_)); 1710 &history_db_));
1714 scoped_ptr<AndroidProviderBackend> backend( 1711 scoped_ptr<AndroidProviderBackend> backend(
1715 new AndroidProviderBackend(android_cache_db_name_, &history_db_, 1712 new AndroidProviderBackend(android_cache_db_name_, &history_db_,
1716 &thumbnail_db_, bookmark_model_, &delegate_)); 1713 &thumbnail_db_, bookmark_model_, &delegate_));
1717 HistoryAndBookmarkRow row1; 1714 HistoryAndBookmarkRow row1;
1718 row1.set_raw_url("cnn.com"); 1715 row1.set_raw_url("cnn.com");
1719 row1.set_url(GURL("http://cnn.com")); 1716 row1.set_url(GURL("http://cnn.com"));
1720 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1)); 1717 row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
1721 row1.set_created(Time::Now() - TimeDelta::FromDays(20)); 1718 row1.set_created(Time::Now() - TimeDelta::FromDays(20));
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 // Query by folder=1, the row2 should returned. 1751 // Query by folder=1, the row2 should returned.
1755 statement.reset(backend->QueryHistoryAndBookmarks( 1752 statement.reset(backend->QueryHistoryAndBookmarks(
1756 projections, std::string("folder=1"), std::vector<string16>(), 1753 projections, std::string("folder=1"), std::vector<string16>(),
1757 std::string("url ASC"))); 1754 std::string("url ASC")));
1758 ASSERT_TRUE(statement->statement()->Step()); 1755 ASSERT_TRUE(statement->statement()->Step());
1759 EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0))); 1756 EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
1760 EXPECT_FALSE(statement->statement()->Step()); 1757 EXPECT_FALSE(statement->statement()->Step());
1761 } 1758 }
1762 1759
1763 } // namespace history 1760 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698