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

Side by Side Diff: chrome/browser/history/expire_history_backend_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
« no previous file with comments | « chrome/browser/history/expire_history_backend.cc ('k') | chrome/browser/history/history.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include <utility> 6 #include <utility>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 VisitRow visit_row2; 248 VisitRow visit_row2;
249 visit_row2.url_id = url_ids[1]; 249 visit_row2.url_id = url_ids[1];
250 visit_row2.visit_time = visit_times[1]; 250 visit_row2.visit_time = visit_times[1];
251 visit_row2.is_indexed = true; 251 visit_row2.is_indexed = true;
252 main_db_->AddVisit(&visit_row2, SOURCE_BROWSED); 252 main_db_->AddVisit(&visit_row2, SOURCE_BROWSED);
253 253
254 VisitRow visit_row3; 254 VisitRow visit_row3;
255 visit_row3.url_id = url_ids[1]; 255 visit_row3.url_id = url_ids[1];
256 visit_row3.visit_time = visit_times[2]; 256 visit_row3.visit_time = visit_times[2];
257 visit_row3.is_indexed = true; 257 visit_row3.is_indexed = true;
258 visit_row3.transition = PageTransition::TYPED; 258 visit_row3.transition = content::PAGE_TRANSITION_TYPED;
259 main_db_->AddVisit(&visit_row3, SOURCE_BROWSED); 259 main_db_->AddVisit(&visit_row3, SOURCE_BROWSED);
260 260
261 VisitRow visit_row4; 261 VisitRow visit_row4;
262 visit_row4.url_id = url_ids[2]; 262 visit_row4.url_id = url_ids[2];
263 visit_row4.visit_time = visit_times[3]; 263 visit_row4.visit_time = visit_times[3];
264 visit_row4.is_indexed = true; 264 visit_row4.is_indexed = true;
265 main_db_->AddVisit(&visit_row4, SOURCE_BROWSED); 265 main_db_->AddVisit(&visit_row4, SOURCE_BROWSED);
266 266
267 // Full text index for each visit. 267 // Full text index for each visit.
268 text_db_->AddPageData(url_row1.url(), visit_row1.url_id, visit_row1.visit_id, 268 text_db_->AddPageData(url_row1.url(), visit_row1.url_id, visit_row1.visit_id,
(...skipping 21 matching lines...) Expand all
290 Time last_visit_time = Time::Now(); 290 Time last_visit_time = Time::Now();
291 // Add one URL. 291 // Add one URL.
292 URLRow url_row1(url); 292 URLRow url_row1(url);
293 url_row1.set_last_visit(last_visit_time); 293 url_row1.set_last_visit(last_visit_time);
294 url_row1.set_visit_count(4); 294 url_row1.set_visit_count(4);
295 URLID url_id = main_db_->AddURL(url_row1); 295 URLID url_id = main_db_->AddURL(url_row1);
296 *id = url_id; 296 *id = url_id;
297 297
298 // Four times for each visit. 298 // Four times for each visit.
299 VisitRow visit_row1(url_id, last_visit_time - TimeDelta::FromDays(4), 0, 299 VisitRow visit_row1(url_id, last_visit_time - TimeDelta::FromDays(4), 0,
300 PageTransition::TYPED, 0); 300 content::PAGE_TRANSITION_TYPED, 0);
301 main_db_->AddVisit(&visit_row1, SOURCE_SYNCED); 301 main_db_->AddVisit(&visit_row1, SOURCE_SYNCED);
302 302
303 VisitRow visit_row2(url_id, last_visit_time - TimeDelta::FromDays(3), 0, 303 VisitRow visit_row2(url_id, last_visit_time - TimeDelta::FromDays(3), 0,
304 PageTransition::TYPED, 0); 304 content::PAGE_TRANSITION_TYPED, 0);
305 main_db_->AddVisit(&visit_row2, SOURCE_BROWSED); 305 main_db_->AddVisit(&visit_row2, SOURCE_BROWSED);
306 306
307 VisitRow visit_row3(url_id, last_visit_time - TimeDelta::FromDays(2), 0, 307 VisitRow visit_row3(url_id, last_visit_time - TimeDelta::FromDays(2), 0,
308 PageTransition::TYPED, 0); 308 content::PAGE_TRANSITION_TYPED, 0);
309 main_db_->AddVisit(&visit_row3, SOURCE_EXTENSION); 309 main_db_->AddVisit(&visit_row3, SOURCE_EXTENSION);
310 310
311 VisitRow visit_row4(url_id, last_visit_time, 0, PageTransition::TYPED, 0); 311 VisitRow visit_row4(
312 url_id, last_visit_time, 0, content::PAGE_TRANSITION_TYPED, 0);
312 main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED); 313 main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED);
313 } 314 }
314 315
315 bool ExpireHistoryTest::HasFavicon(FaviconID favicon_id) { 316 bool ExpireHistoryTest::HasFavicon(FaviconID favicon_id) {
316 if (!thumb_db_.get() || favicon_id == 0) 317 if (!thumb_db_.get() || favicon_id == 0)
317 return false; 318 return false;
318 Time last_updated; 319 Time last_updated;
319 std::vector<unsigned char> icon_data_unused; 320 std::vector<unsigned char> icon_data_unused;
320 GURL icon_url; 321 GURL icon_url;
321 return thumb_db_->GetFavicon(favicon_id, &last_updated, &icon_data_unused, 322 return thumb_db_->GetFavicon(favicon_id, &last_updated, &icon_data_unused,
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 main_db_->GetVisitsForURL(url_id, &archived_visits); 914 main_db_->GetVisitsForURL(url_id, &archived_visits);
914 EXPECT_EQ(0U, archived_visits.size()); 915 EXPECT_EQ(0U, archived_visits.size());
915 } 916 }
916 917
917 // TODO(brettw) add some visits with no URL to make sure everything is updated 918 // TODO(brettw) add some visits with no URL to make sure everything is updated
918 // properly. Have the visits also refer to nonexistent FTS rows. 919 // properly. Have the visits also refer to nonexistent FTS rows.
919 // 920 //
920 // Maybe also refer to invalid favicons. 921 // Maybe also refer to invalid favicons.
921 922
922 } // namespace history 923 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/expire_history_backend.cc ('k') | chrome/browser/history/history.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698