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

Side by Side Diff: chrome/browser/sync_file_system/drive_metadata_store_unittest.cc

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/sync_file_system/drive_metadata_store.h" 5 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 protected: 93 protected:
94 void InitializeDatabase() { 94 void InitializeDatabase() {
95 EXPECT_TRUE(ui_task_runner_->RunsTasksOnCurrentThread()); 95 EXPECT_TRUE(ui_task_runner_->RunsTasksOnCurrentThread());
96 96
97 bool done = false; 97 bool done = false;
98 SyncStatusCode status = SYNC_STATUS_UNKNOWN; 98 SyncStatusCode status = SYNC_STATUS_UNKNOWN;
99 bool created = false; 99 bool created = false;
100 100
101 drive_metadata_store_.reset( 101 drive_metadata_store_.reset(
102 new DriveMetadataStore(base_dir_.path(), file_task_runner_)); 102 new DriveMetadataStore(base_dir_.path(), file_task_runner_.get()));
103 drive_metadata_store_->Initialize( 103 drive_metadata_store_->Initialize(
104 base::Bind(&DriveMetadataStoreTest::DidInitializeDatabase, 104 base::Bind(&DriveMetadataStoreTest::DidInitializeDatabase,
105 base::Unretained(this), &done, &status, &created)); 105 base::Unretained(this),
106 &done,
107 &status,
108 &created));
106 message_loop_.Run(); 109 message_loop_.Run();
107 110
108 EXPECT_TRUE(done); 111 EXPECT_TRUE(done);
109 EXPECT_EQ(SYNC_STATUS_OK, status); 112 EXPECT_EQ(SYNC_STATUS_OK, status);
110 113
111 if (created) { 114 if (created) {
112 EXPECT_FALSE(created_); 115 EXPECT_FALSE(created_);
113 created_ = created; 116 created_ = created;
114 return; 117 return;
115 } 118 }
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 metadata_store()->AddIncrementalSyncOrigin(kOrigin1, kResourceId1); 602 metadata_store()->AddIncrementalSyncOrigin(kOrigin1, kResourceId1);
600 VerifyIncrementalSyncOrigin(kOrigin1, kResourceId1); 603 VerifyIncrementalSyncOrigin(kOrigin1, kResourceId1);
601 VerifyReverseMap(); 604 VerifyReverseMap();
602 605
603 metadata_store()->SetOriginRootDirectory(kOrigin1, kResourceId2); 606 metadata_store()->SetOriginRootDirectory(kOrigin1, kResourceId2);
604 VerifyIncrementalSyncOrigin(kOrigin1, kResourceId2); 607 VerifyIncrementalSyncOrigin(kOrigin1, kResourceId2);
605 VerifyReverseMap(); 608 VerifyReverseMap();
606 } 609 }
607 610
608 } // namespace sync_file_system 611 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/drive_metadata_store.cc ('k') | chrome/browser/sync_file_system/local_file_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698