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

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

Issue 18332014: Move Copy* into the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: windows Created 7 years, 5 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/history_database.h" 5 #include "chrome/browser/history/history_database.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 10 matching lines...) Expand all
21 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); 21 ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
22 db_file = temp_dir.path().AppendASCII("DropBookmarks.db"); 22 db_file = temp_dir.path().AppendASCII("DropBookmarks.db");
23 sql::Connection::Delete(db_file); 23 sql::Connection::Delete(db_file);
24 24
25 // Copy db file over that contains starred URLs. 25 // Copy db file over that contains starred URLs.
26 base::FilePath old_history_path; 26 base::FilePath old_history_path;
27 PathService::Get(chrome::DIR_TEST_DATA, &old_history_path); 27 PathService::Get(chrome::DIR_TEST_DATA, &old_history_path);
28 old_history_path = old_history_path.AppendASCII("bookmarks"); 28 old_history_path = old_history_path.AppendASCII("bookmarks");
29 old_history_path = old_history_path.Append( 29 old_history_path = old_history_path.Append(
30 FILE_PATH_LITERAL("History_with_starred")); 30 FILE_PATH_LITERAL("History_with_starred"));
31 file_util::CopyFile(old_history_path, db_file); 31 base::CopyFile(old_history_path, db_file);
32 32
33 // Load the DB twice. The first time it should migrate. Make sure that the 33 // Load the DB twice. The first time it should migrate. Make sure that the
34 // migration leaves it in a state fit to load again later. 34 // migration leaves it in a state fit to load again later.
35 for (int i = 0; i < 2; ++i) { 35 for (int i = 0; i < 2; ++i) {
36 HistoryDatabase history_db; 36 HistoryDatabase history_db;
37 ASSERT_EQ(sql::INIT_OK, history_db.Init(db_file)); 37 ASSERT_EQ(sql::INIT_OK, history_db.Init(db_file));
38 HistoryDatabase::URLEnumerator url_enumerator; 38 HistoryDatabase::URLEnumerator url_enumerator;
39 ASSERT_TRUE(history_db.InitURLEnumeratorForEverything(&url_enumerator)); 39 ASSERT_TRUE(history_db.InitURLEnumeratorForEverything(&url_enumerator));
40 int num_urls = 0; 40 int num_urls = 0;
41 URLRow url_row; 41 URLRow url_row;
42 while (url_enumerator.GetNextURL(&url_row)) { 42 while (url_enumerator.GetNextURL(&url_row)) {
43 ++num_urls; 43 ++num_urls;
44 } 44 }
45 ASSERT_EQ(5, num_urls); 45 ASSERT_EQ(5, num_urls);
46 } 46 }
47 } 47 }
48 48
49 } // namespace history 49 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/history_backend_unittest.cc ('k') | chrome/browser/importer/firefox_importer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698