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

Side by Side Diff: chrome/browser/history/android/android_urls_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_urls_database.h" 5 #include "components/history/core/browser/android/android_urls_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/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/common/chrome_constants.h" 10 #include "chrome/common/chrome_constants.h"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "components/history/core/browser/history_constants.h" 13 #include "components/history/core/browser/history_constants.h"
14 #include "components/history/core/browser/history_database.h" 14 #include "components/history/core/browser/history_database.h"
15 #include "components/history/core/test/history_unittest_base.h" 15 #include "components/history/core/test/history_unittest_base.h"
16 #include "components/history/core/test/test_history_database.h" 16 #include "components/history/core/test/test_history_database.h"
17 17
18 namespace history { 18 namespace history {
19 19
20 class AndroidURLsMigrationTest : public HistoryUnitTestBase { 20 class AndroidURLsMigrationTest : public HistoryUnitTestBase {
21 public: 21 public:
22 AndroidURLsMigrationTest() {} 22 AndroidURLsMigrationTest() {}
23 virtual ~AndroidURLsMigrationTest() {} 23 ~AndroidURLsMigrationTest() override {}
24 24
25 protected: 25 protected:
26 virtual void SetUp() { 26 void SetUp() override {
27 profile_.reset(new TestingProfile); 27 profile_.reset(new TestingProfile);
28 28
29 base::FilePath data_path; 29 base::FilePath data_path;
30 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path)); 30 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
31 data_path = data_path.AppendASCII("History"); 31 data_path = data_path.AppendASCII("History");
32 32
33 history_db_name_ = profile_->GetPath().Append(kHistoryFilename); 33 history_db_name_ = profile_->GetPath().Append(kHistoryFilename);
34 // Set up history as they would be before migration. 34 // Set up history as they would be before migration.
35 ASSERT_NO_FATAL_FAILURE( 35 ASSERT_NO_FATAL_FAILURE(
36 ExecuteSQLScript(data_path.AppendASCII("history.21.sql"), 36 ExecuteSQLScript(data_path.AppendASCII("history.21.sql"),
(...skipping 22 matching lines...) Expand all
59 59
60 ASSERT_TRUE(statement.Step()); 60 ASSERT_TRUE(statement.Step());
61 EXPECT_EQ(4, statement.ColumnInt64(0)); 61 EXPECT_EQ(4, statement.ColumnInt64(0));
62 EXPECT_EQ("www.google.com/", statement.ColumnString(2)); 62 EXPECT_EQ("www.google.com/", statement.ColumnString(2));
63 EXPECT_EQ(3, statement.ColumnInt64(1)); 63 EXPECT_EQ(3, statement.ColumnInt64(1));
64 64
65 EXPECT_FALSE(statement.Step()); 65 EXPECT_FALSE(statement.Step());
66 } 66 }
67 67
68 } // namespace history 68 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698