| 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 "chrome/browser/chromeos/drive/directory_loader.h" | 5 #include "chrome/browser/chromeos/drive/directory_loader.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 virtual ~TestDirectoryLoaderObserver() { | 39 virtual ~TestDirectoryLoaderObserver() { |
| 40 loader_->RemoveObserver(this); | 40 loader_->RemoveObserver(this); |
| 41 } | 41 } |
| 42 | 42 |
| 43 const std::set<base::FilePath>& changed_directories() const { | 43 const std::set<base::FilePath>& changed_directories() const { |
| 44 return changed_directories_; | 44 return changed_directories_; |
| 45 } | 45 } |
| 46 void clear_changed_directories() { changed_directories_.clear(); } | 46 void clear_changed_directories() { changed_directories_.clear(); } |
| 47 | 47 |
| 48 // ChageListObserver overrides: | 48 // ChageListObserver overrides: |
| 49 virtual void OnDirectoryChanged( | 49 virtual void OnDirectoryReloaded( |
| 50 const base::FilePath& directory_path) OVERRIDE { | 50 const base::FilePath& directory_path) OVERRIDE { |
| 51 changed_directories_.insert(directory_path); | 51 changed_directories_.insert(directory_path); |
| 52 } | 52 } |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 DirectoryLoader* loader_; | 55 DirectoryLoader* loader_; |
| 56 std::set<base::FilePath> changed_directories_; | 56 std::set<base::FilePath> changed_directories_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(TestDirectoryLoaderObserver); | 58 DISALLOW_COPY_AND_ASSIGN(TestDirectoryLoaderObserver); |
| 59 }; | 59 }; |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 | 243 |
| 244 // Unlock the loader, this should resume the pending udpate. | 244 // Unlock the loader, this should resume the pending udpate. |
| 245 lock.reset(); | 245 lock.reset(); |
| 246 base::RunLoop().RunUntilIdle(); | 246 base::RunLoop().RunUntilIdle(); |
| 247 EXPECT_EQ(1U, observer.changed_directories().count( | 247 EXPECT_EQ(1U, observer.changed_directories().count( |
| 248 util::GetDriveMyDriveRootPath())); | 248 util::GetDriveMyDriveRootPath())); |
| 249 } | 249 } |
| 250 | 250 |
| 251 } // namespace internal | 251 } // namespace internal |
| 252 } // namespace drive | 252 } // namespace drive |
| OLD | NEW |