| 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> |
| 8 |
| 7 #include <deque> | 9 #include <deque> |
| 8 | 10 |
| 9 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_value_converter.h" | 12 #include "base/json/json_value_converter.h" |
| 11 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
| 12 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 13 #include "base/strings/string_piece.h" | 15 #include "base/strings/string_piece.h" |
| 14 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 15 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 16 #include "chrome/browser/chromeos/drive/file_system_util.h" | 18 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 } | 725 } |
| 724 | 726 |
| 725 drive::DriveIntegrationService* | 727 drive::DriveIntegrationService* |
| 726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { | 728 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { |
| 727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); | 729 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); |
| 728 return drive_volumes_[profile->GetOriginalProfile()] | 730 return drive_volumes_[profile->GetOriginalProfile()] |
| 729 ->CreateDriveIntegrationService(profile); | 731 ->CreateDriveIntegrationService(profile); |
| 730 } | 732 } |
| 731 | 733 |
| 732 } // namespace file_manager | 734 } // namespace file_manager |
| OLD | NEW |