| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // MediaFileSystemRegistry unit tests. | 5 // MediaFileSystemRegistry unit tests. |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 bool media_device); | 358 bool media_device); |
| 359 | 359 |
| 360 std::vector<MediaFileSystemInfo> GetAutoAddedGalleries( | 360 std::vector<MediaFileSystemInfo> GetAutoAddedGalleries( |
| 361 ProfileState* profile_state); | 361 ProfileState* profile_state); |
| 362 | 362 |
| 363 // TODO(gbillock): Rework these once windows-specific code is gone. | 363 // TODO(gbillock): Rework these once windows-specific code is gone. |
| 364 void ProcessAttach(const std::string& id, | 364 void ProcessAttach(const std::string& id, |
| 365 const string16& name, | 365 const string16& name, |
| 366 const base::FilePath::StringType& location) { | 366 const base::FilePath::StringType& location) { |
| 367 RemovableStorageNotifications::GetInstance()->receiver()->ProcessAttach( | 367 RemovableStorageNotifications::GetInstance()->receiver()->ProcessAttach( |
| 368 id, name, location); | 368 RemovableStorageNotifications::StorageInfo(id, name, location)); |
| 369 } | 369 } |
| 370 | 370 |
| 371 void ProcessDetach(const std::string& id) { | 371 void ProcessDetach(const std::string& id) { |
| 372 RemovableStorageNotifications::GetInstance()->receiver()->ProcessDetach(id); | 372 RemovableStorageNotifications::GetInstance()->receiver()->ProcessDetach(id); |
| 373 } | 373 } |
| 374 | 374 |
| 375 protected: | 375 protected: |
| 376 virtual void SetUp() OVERRIDE; | 376 virtual void SetUp() OVERRIDE; |
| 377 virtual void TearDown() OVERRIDE; | 377 virtual void TearDown() OVERRIDE; |
| 378 | 378 |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 963 pref_info_with_relpath.device_id = device_id; | 963 pref_info_with_relpath.device_id = device_id; |
| 964 EXPECT_EQ(dcim_dir().Append(pref_info_with_relpath.path).value(), | 964 EXPECT_EQ(dcim_dir().Append(pref_info_with_relpath.path).value(), |
| 965 pref_info_with_relpath.AbsolutePath().value()); | 965 pref_info_with_relpath.AbsolutePath().value()); |
| 966 | 966 |
| 967 DetachDevice(device_id); | 967 DetachDevice(device_id); |
| 968 EXPECT_TRUE(pref_info.AbsolutePath().empty()); | 968 EXPECT_TRUE(pref_info.AbsolutePath().empty()); |
| 969 EXPECT_TRUE(pref_info_with_relpath.AbsolutePath().empty()); | 969 EXPECT_TRUE(pref_info_with_relpath.AbsolutePath().empty()); |
| 970 } | 970 } |
| 971 | 971 |
| 972 } // namespace chrome | 972 } // namespace chrome |
| OLD | NEW |