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 "base/json/json_reader.h" | 5 #include "base/json/json_reader.h" |
6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/drive/fake_drive_service.h" | 10 #include "chrome/browser/drive/fake_drive_service.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> | 94 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> |
95 drive_service_factory(new FakeDriveServiceFactory(this)); | 95 drive_service_factory(new FakeDriveServiceFactory(this)); |
96 | 96 |
97 fake_signin_manager_.reset(new FakeSigninManagerForTesting( | 97 fake_signin_manager_.reset(new FakeSigninManagerForTesting( |
98 browser()->profile())); | 98 browser()->profile())); |
99 | 99 |
100 remote_service_ = new drive_backend::SyncEngine( | 100 remote_service_ = new drive_backend::SyncEngine( |
101 base::ThreadTaskRunnerHandle::Get(), // ui_task_runner | 101 base::ThreadTaskRunnerHandle::Get(), // ui_task_runner |
102 MakeSequencedTaskRunner(), | 102 MakeSequencedTaskRunner(), |
103 MakeSequencedTaskRunner(), | 103 MakeSequencedTaskRunner(), |
| 104 content::BrowserThread::GetBlockingPool(), |
104 base_dir_.path(), | 105 base_dir_.path(), |
105 NULL, // task_logger | 106 NULL, // task_logger |
106 NULL, // notification_manager | 107 NULL, // notification_manager |
107 extension_service, | 108 extension_service, |
108 fake_signin_manager_.get(), // signin_manager | 109 fake_signin_manager_.get(), // signin_manager |
109 NULL, // token_service | 110 NULL, // token_service |
110 NULL, // request_context | 111 NULL, // request_context |
111 drive_service_factory.Pass(), | 112 drive_service_factory.Pass(), |
112 in_memory_env_.get()); | 113 in_memory_env_.get()); |
113 remote_service_->SetSyncEnabled(true); | 114 remote_service_->SetSyncEnabled(true); |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 | 206 |
206 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); | 207 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); |
207 WaitUntilIdle(); | 208 WaitUntilIdle(); |
208 | 209 |
209 bar_created.Reply("resume"); | 210 bar_created.Reply("resume"); |
210 | 211 |
211 EXPECT_TRUE(catcher.GetNextResult()); | 212 EXPECT_TRUE(catcher.GetNextResult()); |
212 } | 213 } |
213 | 214 |
214 } // namespace sync_file_system | 215 } // namespace sync_file_system |
OLD | NEW |