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

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

Issue 885283009: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 "components/history/core/browser/android/android_cache_database.h" 5 #include "components/history/core/browser/android/android_cache_database.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
11 #include "components/history/core/browser/android/android_time.h" 11 #include "components/history/core/browser/android/android_time.h"
12 #include "components/history/core/browser/history_database.h" 12 #include "components/history/core/browser/history_database.h"
13 #include "components/history/core/test/test_history_database.h" 13 #include "components/history/core/test/test_history_database.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 using base::Time; 16 using base::Time;
17 using base::TimeDelta; 17 using base::TimeDelta;
18 18
19 namespace history { 19 namespace history {
20 20
21 class AndroidCacheDatabaseTest : public testing::Test { 21 class AndroidCacheDatabaseTest : public testing::Test {
22 public: 22 public:
23 AndroidCacheDatabaseTest() {} 23 AndroidCacheDatabaseTest() {}
24 virtual ~AndroidCacheDatabaseTest() {} 24 ~AndroidCacheDatabaseTest() override {}
25 25
26 protected: 26 protected:
27 virtual void SetUp() { 27 void SetUp() override {
28 // Get a temporary directory for the test DB files. 28 // Get a temporary directory for the test DB files.
29 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 29 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
30 base::FilePath history_db_name_ = 30 base::FilePath history_db_name_ =
31 temp_dir_.path().AppendASCII("history.db"); 31 temp_dir_.path().AppendASCII("history.db");
32 android_cache_db_name_ = temp_dir_.path().AppendASCII( 32 android_cache_db_name_ = temp_dir_.path().AppendASCII(
33 "TestAndroidCache.db"); 33 "TestAndroidCache.db");
34 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_)); 34 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
35 ASSERT_EQ(sql::INIT_OK, 35 ASSERT_EQ(sql::INIT_OK,
36 history_db_.InitAndroidCacheDatabase(android_cache_db_name_)); 36 history_db_.InitAndroidCacheDatabase(android_cache_db_name_));
37 } 37 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL)); 106 EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL));
107 // The search_term2 should still in the table. 107 // The search_term2 should still in the table.
108 ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1)); 108 ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1));
109 EXPECT_EQ(id2, row1.id); 109 EXPECT_EQ(id2, row1.id);
110 EXPECT_EQ(ToDatabaseTime(search_time2), 110 EXPECT_EQ(ToDatabaseTime(search_time2),
111 ToDatabaseTime(row1.last_visit_time)); 111 ToDatabaseTime(row1.last_visit_time));
112 EXPECT_EQ(search_term2, row1.term); 112 EXPECT_EQ(search_term2, row1.term);
113 } 113 }
114 114
115 } // namespace history 115 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698