| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 for (size_t i = 0; i < file_systems.size(); ++i) { | 46 for (size_t i = 0; i < file_systems.size(); ++i) { |
| 47 ASSERT_FALSE(ContainsKey(*results, file_systems[i].pref_id)); | 47 ASSERT_FALSE(ContainsKey(*results, file_systems[i].pref_id)); |
| 48 (*results)[file_systems[i].pref_id] = file_systems[i]; | 48 (*results)[file_systems[i].pref_id] = file_systems[i]; |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace | 52 } // namespace |
| 53 | 53 |
| 54 class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness { | 54 class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness { |
| 55 protected: | 55 protected: |
| 56 void SetUp() OVERRIDE; | 56 void SetUp() override; |
| 57 void TearDown() OVERRIDE; | 57 void TearDown() override; |
| 58 | 58 |
| 59 void ProcessAttach(const std::string& id, | 59 void ProcessAttach(const std::string& id, |
| 60 const base::string16& name, | 60 const base::string16& name, |
| 61 const base::FilePath::StringType& location); | 61 const base::FilePath::StringType& location); |
| 62 std::string AttachDevice(StorageInfo::Type type, | 62 std::string AttachDevice(StorageInfo::Type type, |
| 63 const std::string& unique_id, | 63 const std::string& unique_id, |
| 64 const base::FilePath& location); | 64 const base::FilePath& location); |
| 65 void CheckGalleryInfo(const MediaFileSystemInfo& info, | 65 void CheckGalleryInfo(const MediaFileSystemInfo& info, |
| 66 const base::string16& name, | 66 const base::string16& name, |
| 67 const base::FilePath& path, | 67 const base::FilePath& path, |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 for (FSInfoMap::iterator i = results.begin(); i != results.end(); ++i) { | 173 for (FSInfoMap::iterator i = results.begin(); i != results.end(); ++i) { |
| 174 MediaFileSystemInfo info = i->second; | 174 MediaFileSystemInfo info = i->second; |
| 175 if (info.path == location) { | 175 if (info.path == location) { |
| 176 CheckGalleryInfo(info, location.LossyDisplayName(), location, true, true); | 176 CheckGalleryInfo(info, location.LossyDisplayName(), location, true, true); |
| 177 checked = true; | 177 checked = true; |
| 178 break; | 178 break; |
| 179 } | 179 } |
| 180 } | 180 } |
| 181 EXPECT_TRUE(checked); | 181 EXPECT_TRUE(checked); |
| 182 } | 182 } |
| OLD | NEW |