OLD | NEW |
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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/invalidation/invalidation_service_factory.h" | 10 #include "chrome/browser/invalidation/invalidation_service_factory.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 virtual void Initialize( | 158 virtual void Initialize( |
159 SyncFrontend* frontend, | 159 SyncFrontend* frontend, |
160 scoped_ptr<base::Thread> sync_thread, | 160 scoped_ptr<base::Thread> sync_thread, |
161 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, | 161 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, |
162 const GURL& service_url, | 162 const GURL& service_url, |
163 const syncer::SyncCredentials& credentials, | 163 const syncer::SyncCredentials& credentials, |
164 bool delete_sync_data_folder, | 164 bool delete_sync_data_folder, |
165 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory, | 165 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory, |
166 scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler, | 166 scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler, |
167 syncer::ReportUnrecoverableErrorFunction | 167 syncer::ReportUnrecoverableErrorFunction |
168 report_unrecoverable_error_function) OVERRIDE {} | 168 report_unrecoverable_error_function, |
| 169 syncer::HttpPostProviderFactoryFactory* |
| 170 http_post_provider_factory_factory) OVERRIDE {} |
169 }; | 171 }; |
170 | 172 |
171 ACTION(ReturnNewSyncBackendHostMock) { | 173 ACTION(ReturnNewSyncBackendHostMock) { |
172 return new browser_sync::SyncBackendHostMock(); | 174 return new browser_sync::SyncBackendHostMock(); |
173 } | 175 } |
174 | 176 |
175 ACTION(ReturnNewSyncBackendHostNoReturn) { | 177 ACTION(ReturnNewSyncBackendHostNoReturn) { |
176 return new browser_sync::SyncBackendHostNoReturn(); | 178 return new browser_sync::SyncBackendHostNoReturn(); |
177 } | 179 } |
178 | 180 |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 EXPECT_TRUE(token_status.next_token_request_time.is_null()); | 549 EXPECT_TRUE(token_status.next_token_request_time.is_null()); |
548 | 550 |
549 // Simulate successful connection. | 551 // Simulate successful connection. |
550 service_->OnConnectionStatusChange(syncer::CONNECTION_OK); | 552 service_->OnConnectionStatusChange(syncer::CONNECTION_OK); |
551 token_status = service_->GetSyncTokenStatus(); | 553 token_status = service_->GetSyncTokenStatus(); |
552 EXPECT_EQ(syncer::CONNECTION_OK, token_status.connection_status); | 554 EXPECT_EQ(syncer::CONNECTION_OK, token_status.connection_status); |
553 } | 555 } |
554 | 556 |
555 } // namespace | 557 } // namespace |
556 } // namespace browser_sync | 558 } // namespace browser_sync |
OLD | NEW |