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 |
11 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
12 #include "base/json/json_value_converter.h" | 12 #include "base/json/json_value_converter.h" |
13 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
| 14 #include "base/message_loop/message_loop.h" |
14 #include "base/path_service.h" | 15 #include "base/path_service.h" |
15 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
16 #include "base/strings/string_piece.h" | 17 #include "base/strings/string_piece.h" |
17 #include "base/threading/thread_restrictions.h" | 18 #include "base/threading/thread_restrictions.h" |
18 #include "base/time/time.h" | 19 #include "base/time/time.h" |
19 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/chromeos/drive/file_system_util.h" | 21 #include "chrome/browser/chromeos/drive/file_system_util.h" |
21 #include "chrome/browser/chromeos/file_manager/app_id.h" | 22 #include "chrome/browser/chromeos/file_manager/app_id.h" |
22 #include "chrome/browser/chromeos/file_manager/mount_test_util.h" | 23 #include "chrome/browser/chromeos/file_manager/mount_test_util.h" |
23 #include "chrome/browser/chromeos/file_manager/path_util.h" | 24 #include "chrome/browser/chromeos/file_manager/path_util.h" |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
753 } | 754 } |
754 | 755 |
755 drive::DriveIntegrationService* | 756 drive::DriveIntegrationService* |
756 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { | 757 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { |
757 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); | 758 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); |
758 return drive_volumes_[profile->GetOriginalProfile()] | 759 return drive_volumes_[profile->GetOriginalProfile()] |
759 ->CreateDriveIntegrationService(profile); | 760 ->CreateDriveIntegrationService(profile); |
760 } | 761 } |
761 | 762 |
762 } // namespace file_manager | 763 } // namespace file_manager |
OLD | NEW |