OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stdint.h> | 5 #include <stdint.h> |
| 6 #include <utility> |
6 | 7 |
7 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
8 #include "base/macros.h" | 9 #include "base/macros.h" |
9 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
10 #include "base/thread_task_runner_handle.h" | 11 #include "base/thread_task_runner_handle.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "chrome/browser/apps/app_browsertest_util.h" | 13 #include "chrome/browser/apps/app_browsertest_util.h" |
13 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
14 #include "chrome/browser/signin/fake_signin_manager_builder.h" | 15 #include "chrome/browser/signin/fake_signin_manager_builder.h" |
15 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" | 16 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" |
(...skipping 19 matching lines...) Expand all Loading... |
35 : change_observer_(change_observer) {} | 36 : change_observer_(change_observer) {} |
36 ~FakeDriveServiceFactory() override {} | 37 ~FakeDriveServiceFactory() override {} |
37 | 38 |
38 scoped_ptr<drive::DriveServiceInterface> CreateDriveService( | 39 scoped_ptr<drive::DriveServiceInterface> CreateDriveService( |
39 OAuth2TokenService* oauth2_token_service, | 40 OAuth2TokenService* oauth2_token_service, |
40 net::URLRequestContextGetter* url_request_context_getter, | 41 net::URLRequestContextGetter* url_request_context_getter, |
41 base::SequencedTaskRunner* blocking_task_runner) override { | 42 base::SequencedTaskRunner* blocking_task_runner) override { |
42 scoped_ptr<drive::FakeDriveService> drive_service( | 43 scoped_ptr<drive::FakeDriveService> drive_service( |
43 new drive::FakeDriveService); | 44 new drive::FakeDriveService); |
44 drive_service->AddChangeObserver(change_observer_); | 45 drive_service->AddChangeObserver(change_observer_); |
45 return drive_service.Pass(); | 46 return std::move(drive_service); |
46 } | 47 } |
47 | 48 |
48 private: | 49 private: |
49 drive::FakeDriveService::ChangeObserver* change_observer_; | 50 drive::FakeDriveService::ChangeObserver* change_observer_; |
50 | 51 |
51 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceFactory); | 52 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceFactory); |
52 }; | 53 }; |
53 | 54 |
54 } // namespace | 55 } // namespace |
55 | 56 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 extensions::ExtensionSystem::Get(context)->extension_service(); | 96 extensions::ExtensionSystem::Get(context)->extension_service(); |
96 | 97 |
97 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> | 98 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> |
98 drive_service_factory(new FakeDriveServiceFactory(this)); | 99 drive_service_factory(new FakeDriveServiceFactory(this)); |
99 | 100 |
100 fake_signin_manager_.reset(new FakeSigninManagerForTesting( | 101 fake_signin_manager_.reset(new FakeSigninManagerForTesting( |
101 browser()->profile())); | 102 browser()->profile())); |
102 | 103 |
103 remote_service_ = new drive_backend::SyncEngine( | 104 remote_service_ = new drive_backend::SyncEngine( |
104 base::ThreadTaskRunnerHandle::Get(), // ui_task_runner | 105 base::ThreadTaskRunnerHandle::Get(), // ui_task_runner |
105 MakeSequencedTaskRunner(), | 106 MakeSequencedTaskRunner(), MakeSequencedTaskRunner(), |
106 MakeSequencedTaskRunner(), | 107 content::BrowserThread::GetBlockingPool(), base_dir_.path(), |
107 content::BrowserThread::GetBlockingPool(), | |
108 base_dir_.path(), | |
109 NULL, // task_logger | 108 NULL, // task_logger |
110 NULL, // notification_manager | 109 NULL, // notification_manager |
111 extension_service, | 110 extension_service, |
112 fake_signin_manager_.get(), // signin_manager | 111 fake_signin_manager_.get(), // signin_manager |
113 NULL, // token_service | 112 NULL, // token_service |
114 NULL, // request_context | 113 NULL, // request_context |
115 drive_service_factory.Pass(), | 114 std::move(drive_service_factory), in_memory_env_.get()); |
116 in_memory_env_.get()); | |
117 remote_service_->SetSyncEnabled(true); | 115 remote_service_->SetSyncEnabled(true); |
118 factory->set_mock_remote_file_service( | 116 factory->set_mock_remote_file_service( |
119 scoped_ptr<RemoteFileSyncService>(remote_service_)); | 117 scoped_ptr<RemoteFileSyncService>(remote_service_)); |
120 } | 118 } |
121 | 119 |
122 // drive::FakeDriveService::ChangeObserver override. | 120 // drive::FakeDriveService::ChangeObserver override. |
123 void OnNewChangeAvailable() override { | 121 void OnNewChangeAvailable() override { |
124 sync_engine()->OnNotificationReceived(); | 122 sync_engine()->OnNotificationReceived(); |
125 } | 123 } |
126 | 124 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 | 207 |
210 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); | 208 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); |
211 WaitUntilIdle(); | 209 WaitUntilIdle(); |
212 | 210 |
213 bar_created.Reply("resume"); | 211 bar_created.Reply("resume"); |
214 | 212 |
215 EXPECT_TRUE(catcher.GetNextResult()); | 213 EXPECT_TRUE(catcher.GetNextResult()); |
216 } | 214 } |
217 | 215 |
218 } // namespace sync_file_system | 216 } // namespace sync_file_system |
OLD | NEW |