| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <stack> | 6 #include <stack> |
| 7 | 7 |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 for (iterator itr = file_systems_.begin(); | 124 for (iterator itr = file_systems_.begin(); |
| 125 itr != file_systems_.end(); ++itr) { | 125 itr != file_systems_.end(); ++itr) { |
| 126 itr->second->TearDown(); | 126 itr->second->TearDown(); |
| 127 delete itr->second; | 127 delete itr->second; |
| 128 } | 128 } |
| 129 file_systems_.clear(); | 129 file_systems_.clear(); |
| 130 | 130 |
| 131 fake_drive_service_helper_.reset(); | 131 fake_drive_service_helper_.reset(); |
| 132 remote_sync_service_.reset(); | 132 remote_sync_service_.reset(); |
| 133 | 133 |
| 134 content::BrowserThread::GetBlockingPool()->FlushForTesting(); |
| 134 base::RunLoop().RunUntilIdle(); | 135 base::RunLoop().RunUntilIdle(); |
| 135 RevokeSyncableFileSystem(); | 136 RevokeSyncableFileSystem(); |
| 136 } | 137 } |
| 137 | 138 |
| 138 virtual void OnRemoteChangeQueueUpdated(int64 pending_changes_hint) OVERRIDE { | 139 virtual void OnRemoteChangeQueueUpdated(int64 pending_changes_hint) OVERRIDE { |
| 139 pending_remote_changes_ = pending_changes_hint; | 140 pending_remote_changes_ = pending_changes_hint; |
| 140 } | 141 } |
| 141 | 142 |
| 142 virtual void OnLocalChangeAvailable(int64 pending_changes_hint) OVERRIDE { | 143 virtual void OnLocalChangeAvailable(int64 pending_changes_hint) OVERRIDE { |
| 143 pending_local_changes_ = pending_changes_hint; | 144 pending_local_changes_ = pending_changes_hint; |
| (...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1609 | 1610 |
| 1610 EXPECT_EQ(1u, CountApp()); | 1611 EXPECT_EQ(1u, CountApp()); |
| 1611 EXPECT_EQ(1u, CountLocalFile(app_id)); | 1612 EXPECT_EQ(1u, CountLocalFile(app_id)); |
| 1612 | 1613 |
| 1613 EXPECT_EQ(2u, CountMetadata()); | 1614 EXPECT_EQ(2u, CountMetadata()); |
| 1614 EXPECT_EQ(2u, CountTracker()); | 1615 EXPECT_EQ(2u, CountTracker()); |
| 1615 } | 1616 } |
| 1616 | 1617 |
| 1617 } // namespace drive_backend | 1618 } // namespace drive_backend |
| 1618 } // namespace sync_file_system | 1619 } // namespace sync_file_system |
| OLD | NEW |