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 17 matching lines...) Expand all Loading... |
28 : public drive_backend::SyncEngine::DriveServiceFactory { | 28 : public drive_backend::SyncEngine::DriveServiceFactory { |
29 public: | 29 public: |
30 explicit FakeDriveServiceFactory( | 30 explicit FakeDriveServiceFactory( |
31 drive::FakeDriveService::ChangeObserver* change_observer) | 31 drive::FakeDriveService::ChangeObserver* change_observer) |
32 : change_observer_(change_observer) {} | 32 : change_observer_(change_observer) {} |
33 virtual ~FakeDriveServiceFactory() {} | 33 virtual ~FakeDriveServiceFactory() {} |
34 | 34 |
35 virtual scoped_ptr<drive::DriveServiceInterface> CreateDriveService( | 35 virtual scoped_ptr<drive::DriveServiceInterface> CreateDriveService( |
36 OAuth2TokenService* oauth2_token_service, | 36 OAuth2TokenService* oauth2_token_service, |
37 net::URLRequestContextGetter* url_request_context_getter, | 37 net::URLRequestContextGetter* url_request_context_getter, |
38 base::SequencedTaskRunner* blocking_task_runner) OVERRIDE { | 38 base::SequencedTaskRunner* blocking_task_runner) override { |
39 scoped_ptr<drive::FakeDriveService> drive_service( | 39 scoped_ptr<drive::FakeDriveService> drive_service( |
40 new drive::FakeDriveService); | 40 new drive::FakeDriveService); |
41 drive_service->AddChangeObserver(change_observer_); | 41 drive_service->AddChangeObserver(change_observer_); |
42 return drive_service.PassAs<drive::DriveServiceInterface>(); | 42 return drive_service.PassAs<drive::DriveServiceInterface>(); |
43 } | 43 } |
44 | 44 |
45 private: | 45 private: |
46 drive::FakeDriveService::ChangeObserver* change_observer_; | 46 drive::FakeDriveService::ChangeObserver* change_observer_; |
47 | 47 |
48 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceFactory); | 48 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceFactory); |
49 }; | 49 }; |
50 | 50 |
51 } // namespace | 51 } // namespace |
52 | 52 |
53 class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, | 53 class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, |
54 public drive::FakeDriveService::ChangeObserver { | 54 public drive::FakeDriveService::ChangeObserver { |
55 public: | 55 public: |
56 SyncFileSystemTest() | 56 SyncFileSystemTest() |
57 : fake_drive_service_(NULL), | 57 : fake_drive_service_(NULL), |
58 local_service_(NULL), | 58 local_service_(NULL), |
59 remote_service_(NULL) { | 59 remote_service_(NULL) { |
60 } | 60 } |
61 | 61 |
62 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 62 virtual void SetUpInProcessBrowserTestFixture() override { |
63 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 63 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
64 real_minimum_preserved_space_ = | 64 real_minimum_preserved_space_ = |
65 storage::QuotaManager::kMinimumPreserveForSystem; | 65 storage::QuotaManager::kMinimumPreserveForSystem; |
66 storage::QuotaManager::kMinimumPreserveForSystem = 0; | 66 storage::QuotaManager::kMinimumPreserveForSystem = 0; |
67 } | 67 } |
68 | 68 |
69 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { | 69 virtual void TearDownInProcessBrowserTestFixture() override { |
70 storage::QuotaManager::kMinimumPreserveForSystem = | 70 storage::QuotaManager::kMinimumPreserveForSystem = |
71 real_minimum_preserved_space_; | 71 real_minimum_preserved_space_; |
72 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); | 72 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); |
73 } | 73 } |
74 | 74 |
75 scoped_refptr<base::SequencedTaskRunner> MakeSequencedTaskRunner() { | 75 scoped_refptr<base::SequencedTaskRunner> MakeSequencedTaskRunner() { |
76 scoped_refptr<base::SequencedWorkerPool> worker_pool = | 76 scoped_refptr<base::SequencedWorkerPool> worker_pool = |
77 content::BrowserThread::GetBlockingPool(); | 77 content::BrowserThread::GetBlockingPool(); |
78 | 78 |
79 return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( | 79 return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( |
80 worker_pool->GetSequenceToken(), | 80 worker_pool->GetSequenceToken(), |
81 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); | 81 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); |
82 } | 82 } |
83 | 83 |
84 virtual void SetUpOnMainThread() OVERRIDE { | 84 virtual void SetUpOnMainThread() override { |
85 ASSERT_TRUE(base_dir_.CreateUniqueTempDir()); | 85 ASSERT_TRUE(base_dir_.CreateUniqueTempDir()); |
86 | 86 |
87 SyncFileSystemServiceFactory* factory = | 87 SyncFileSystemServiceFactory* factory = |
88 SyncFileSystemServiceFactory::GetInstance(); | 88 SyncFileSystemServiceFactory::GetInstance(); |
89 | 89 |
90 content::BrowserContext* context = browser()->profile(); | 90 content::BrowserContext* context = browser()->profile(); |
91 ExtensionServiceInterface* extension_service = | 91 ExtensionServiceInterface* extension_service = |
92 extensions::ExtensionSystem::Get(context)->extension_service(); | 92 extensions::ExtensionSystem::Get(context)->extension_service(); |
93 | 93 |
94 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> | 94 scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> |
(...skipping 14 matching lines...) Expand all Loading... |
109 NULL, // token_service | 109 NULL, // token_service |
110 NULL, // request_context | 110 NULL, // request_context |
111 drive_service_factory.Pass(), | 111 drive_service_factory.Pass(), |
112 in_memory_env_.get()); | 112 in_memory_env_.get()); |
113 remote_service_->SetSyncEnabled(true); | 113 remote_service_->SetSyncEnabled(true); |
114 factory->set_mock_remote_file_service( | 114 factory->set_mock_remote_file_service( |
115 scoped_ptr<RemoteFileSyncService>(remote_service_)); | 115 scoped_ptr<RemoteFileSyncService>(remote_service_)); |
116 } | 116 } |
117 | 117 |
118 // drive::FakeDriveService::ChangeObserver override. | 118 // drive::FakeDriveService::ChangeObserver override. |
119 virtual void OnNewChangeAvailable() OVERRIDE { | 119 virtual void OnNewChangeAvailable() override { |
120 sync_engine()->OnNotificationReceived(); | 120 sync_engine()->OnNotificationReceived(); |
121 } | 121 } |
122 | 122 |
123 SyncFileSystemService* sync_file_system_service() { | 123 SyncFileSystemService* sync_file_system_service() { |
124 return SyncFileSystemServiceFactory::GetForProfile(browser()->profile()); | 124 return SyncFileSystemServiceFactory::GetForProfile(browser()->profile()); |
125 } | 125 } |
126 | 126 |
127 drive_backend::SyncEngine* sync_engine() { | 127 drive_backend::SyncEngine* sync_engine() { |
128 return static_cast<drive_backend::SyncEngine*>( | 128 return static_cast<drive_backend::SyncEngine*>( |
129 sync_file_system_service()->remote_service_.get()); | 129 sync_file_system_service()->remote_service_.get()); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 | 205 |
206 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); | 206 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); |
207 WaitUntilIdle(); | 207 WaitUntilIdle(); |
208 | 208 |
209 bar_created.Reply("resume"); | 209 bar_created.Reply("resume"); |
210 | 210 |
211 EXPECT_TRUE(catcher.GetNextResult()); | 211 EXPECT_TRUE(catcher.GetNextResult()); |
212 } | 212 } |
213 | 213 |
214 } // namespace sync_file_system | 214 } // namespace sync_file_system |
OLD | NEW |