| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/file_manager/file_manager_browsertest_base.h" | 5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <deque> | 9 #include <deque> |
| 10 | 10 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 converter->RegisterCustomField( | 154 converter->RegisterCustomField( |
| 155 "lastModifiedTime", &TestEntryInfo::last_modified_time, &MapStringToTime); | 155 "lastModifiedTime", &TestEntryInfo::last_modified_time, &MapStringToTime); |
| 156 } | 156 } |
| 157 | 157 |
| 158 // Message from JavaScript to add entries. | 158 // Message from JavaScript to add entries. |
| 159 struct AddEntriesMessage { | 159 struct AddEntriesMessage { |
| 160 // Target volume to be added the |entries|. | 160 // Target volume to be added the |entries|. |
| 161 TargetVolume volume; | 161 TargetVolume volume; |
| 162 | 162 |
| 163 // Entries to be added. | 163 // Entries to be added. |
| 164 ScopedVector<TestEntryInfo> entries; | 164 std::vector<std::unique_ptr<TestEntryInfo>> entries; |
| 165 | 165 |
| 166 // Registers the member information to the given converter. | 166 // Registers the member information to the given converter. |
| 167 static void RegisterJSONConverter( | 167 static void RegisterJSONConverter( |
| 168 base::JSONValueConverter<AddEntriesMessage>* converter); | 168 base::JSONValueConverter<AddEntriesMessage>* converter); |
| 169 }; | 169 }; |
| 170 | 170 |
| 171 // static | 171 // static |
| 172 void AddEntriesMessage::RegisterJSONConverter( | 172 void AddEntriesMessage::RegisterJSONConverter( |
| 173 base::JSONValueConverter<AddEntriesMessage>* converter) { | 173 base::JSONValueConverter<AddEntriesMessage>* converter) { |
| 174 converter->RegisterCustomField("volume", &AddEntriesMessage::volume, | 174 converter->RegisterCustomField("volume", &AddEntriesMessage::volume, |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 } | 735 } |
| 736 | 736 |
| 737 drive::DriveIntegrationService* | 737 drive::DriveIntegrationService* |
| 738 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { | 738 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { |
| 739 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); | 739 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); |
| 740 return drive_volumes_[profile->GetOriginalProfile()] | 740 return drive_volumes_[profile->GetOriginalProfile()] |
| 741 ->CreateDriveIntegrationService(profile); | 741 ->CreateDriveIntegrationService(profile); |
| 742 } | 742 } |
| 743 | 743 |
| 744 } // namespace file_manager | 744 } // namespace file_manager |
| OLD | NEW |