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

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

Issue 11414253: DriveFileSyncService listens to OnAuthenticated event to recover from unavailable state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix broken tests... Created 8 years 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_file_sync_service.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 mock_drive_service_(NULL) { 88 mock_drive_service_(NULL) {
89 } 89 }
90 90
91 virtual void SetUp() OVERRIDE { 91 virtual void SetUp() OVERRIDE {
92 ASSERT_TRUE(fileapi::RegisterSyncableFileSystem( 92 ASSERT_TRUE(fileapi::RegisterSyncableFileSystem(
93 DriveFileSyncService::kServiceName)); 93 DriveFileSyncService::kServiceName));
94 94
95 mock_drive_service_ = new StrictMock<google_apis::MockDriveService>; 95 mock_drive_service_ = new StrictMock<google_apis::MockDriveService>;
96 96
97 EXPECT_CALL(*mock_drive_service(), Initialize(&profile_)); 97 EXPECT_CALL(*mock_drive_service(), Initialize(&profile_));
98 EXPECT_CALL(*mock_drive_service(), AddObserver(_));
98 99
99 sync_client_ = DriveFileSyncClient::CreateForTesting( 100 sync_client_ = DriveFileSyncClient::CreateForTesting(
100 &profile_, 101 &profile_,
101 scoped_ptr<DriveServiceInterface>(mock_drive_service_), 102 scoped_ptr<DriveServiceInterface>(mock_drive_service_),
102 scoped_ptr<DriveUploaderInterface>()).Pass(); 103 scoped_ptr<DriveUploaderInterface>()).Pass();
103 ASSERT_TRUE(base_dir_.CreateUniqueTempDir()); 104 ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
104 metadata_store_.reset(new DriveMetadataStore( 105 metadata_store_.reset(new DriveMetadataStore(
105 base_dir_.path(), base::MessageLoopProxy::current())); 106 base_dir_.path(), base::MessageLoopProxy::current()));
106 107
107 bool done = false; 108 bool done = false;
108 metadata_store_->Initialize(base::Bind(&DidInitialize, &done)); 109 metadata_store_->Initialize(base::Bind(&DidInitialize, &done));
109 message_loop_.RunUntilIdle(); 110 message_loop_.RunUntilIdle();
110 EXPECT_TRUE(done); 111 EXPECT_TRUE(done);
111 } 112 }
112 113
113 void SetUpDriveSyncService() { 114 void SetUpDriveSyncService() {
114 sync_service_ = DriveFileSyncService::CreateForTesting( 115 sync_service_ = DriveFileSyncService::CreateForTesting(
115 base_dir_.path(), sync_client_.Pass(), metadata_store_.Pass()).Pass(); 116 base_dir_.path(), sync_client_.Pass(), metadata_store_.Pass()).Pass();
116 sync_service_->AddObserver(&mock_remote_observer_); 117 sync_service_->AddObserver(&mock_remote_observer_);
117 } 118 }
118 119
119 virtual void TearDown() OVERRIDE { 120 virtual void TearDown() OVERRIDE {
121 EXPECT_CALL(*mock_drive_service(), RemoveObserver(_));
120 EXPECT_CALL(*mock_drive_service(), CancelAll()); 122 EXPECT_CALL(*mock_drive_service(), CancelAll());
121 123
122 if (sync_service_) { 124 if (sync_service_) {
123 sync_service_.reset(); 125 sync_service_.reset();
124 } 126 }
125 127
126 metadata_store_.reset(); 128 metadata_store_.reset();
127 sync_client_.reset(); 129 sync_client_.reset();
128 mock_drive_service_ = NULL; 130 mock_drive_service_ = NULL;
129 131
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 *LoadJSONFile("gdata/file_entry.json"))); 853 *LoadJSONFile("gdata/file_entry.json")));
852 AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345); 854 AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
853 ProcessRemoteChange(fileapi::SYNC_STATUS_OK, 855 ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
854 CreateURL(kOrigin, kFileName), 856 CreateURL(kOrigin, kFileName),
855 fileapi::SYNC_OPERATION_UPDATE); 857 fileapi::SYNC_OPERATION_UPDATE);
856 } 858 }
857 859
858 #endif // !defined(OS_ANDROID) 860 #endif // !defined(OS_ANDROID)
859 861
860 } // namespace sync_file_system 862 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698