| Index: chrome/browser/history/android/android_provider_backend_unittest.cc
|
| diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
|
| index 00d38f0f813b4e96f1fa3da340fc83f3f6d9abc3..f12360e0c9254657d9d37193e1ddd8b33737ab41 100644
|
| --- a/chrome/browser/history/android/android_provider_backend_unittest.cc
|
| +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
|
| @@ -201,10 +201,10 @@ class AndroidProviderBackendTest : public testing::Test {
|
| // Setup the database directory and files.
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
|
|
| - history_db_name_ = temp_dir_.path().AppendASCII(kHistoryFilename);
|
| - thumbnail_db_name_ = temp_dir_.path().AppendASCII(kFaviconsFilename);
|
| - android_cache_db_name_ = temp_dir_.path().AppendASCII(
|
| - "TestAndroidCache.db");
|
| + history_db_name_ = temp_dir_.GetPath().AppendASCII(kHistoryFilename);
|
| + thumbnail_db_name_ = temp_dir_.GetPath().AppendASCII(kFaviconsFilename);
|
| + android_cache_db_name_ =
|
| + temp_dir_.GetPath().AppendASCII("TestAndroidCache.db");
|
| }
|
|
|
| void AddBookmark(const GURL& url) {
|
| @@ -305,7 +305,7 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) {
|
| history_client_->CreateBackendClient(),
|
| message_loop_.task_runner());
|
| history_backend->Init(false,
|
| - TestHistoryDatabaseParamsForPath(temp_dir_.path()));
|
| + TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
|
| history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
|
| history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
|
| URLRow url_row;
|
| @@ -441,7 +441,7 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) {
|
| history_client_->CreateBackendClient(),
|
| message_loop_.task_runner());
|
| history_backend->Init(false,
|
| - TestHistoryDatabaseParamsForPath(temp_dir_.path()));
|
| + TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
|
| history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
|
| history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
|
|
|
| @@ -1829,7 +1829,7 @@ TEST_F(AndroidProviderBackendTest, QueryWithoutThumbnailDB) {
|
| history_client_->CreateBackendClient(),
|
| message_loop_.task_runner());
|
| history_backend->Init(false,
|
| - TestHistoryDatabaseParamsForPath(temp_dir_.path()));
|
| + TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
|
| history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
|
| history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
|
| URLRow url_row;
|
|
|