chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc - Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service.

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing... Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

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 <deque>	7 #include <deque>

8	8

9 #include "base/json/json_reader.h"	9 #include "base/json/json_reader.h"

10 #include "base/json/json_value_converter.h"	10 #include "base/json/json_value_converter.h"

11 #include "base/json/json_writer.h"	11 #include "base/json/json_writer.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/strings/string_piece.h"	13 #include "base/strings/string_piece.h"

14 #include "base/time/time.h"	14 #include "base/time/time.h"

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/chromeos/drive/file_system_interface.h"	16 #include "chrome/browser/chromeos/drive/file_system_interface.h"

17 #include "chrome/browser/chromeos/drive/file_system_util.h"	17 #include "chrome/browser/chromeos/drive/file_system_util.h"

18 #include "chrome/browser/chromeos/file_manager/mount_test_util.h"	18 #include "chrome/browser/chromeos/file_manager/mount_test_util.h"

19 #include "chrome/browser/chromeos/file_manager/path_util.h"	19 #include "chrome/browser/chromeos/file_manager/path_util.h"

20 #include "chrome/browser/chromeos/file_manager/volume_manager.h"	20 #include "chrome/browser/chromeos/file_manager/volume_manager.h"

21 #include "chrome/browser/drive/fake_drive_service.h"

22 #include "chrome/browser/extensions/component_loader.h"	21 #include "chrome/browser/extensions/component_loader.h"

23 #include "chrome/browser/notifications/notification.h"	22 #include "chrome/browser/notifications/notification.h"

24 #include "chrome/browser/notifications/notification_ui_manager.h"	23 #include "chrome/browser/notifications/notification_ui_manager.h"

25 #include "chrome/common/chrome_switches.h"	24 #include "chrome/common/chrome_switches.h"

26 #include "chromeos/chromeos_switches.h"	25 #include "chromeos/chromeos_switches.h"

	26 #include "components/drive/service/fake_drive_service.h"

27 #include "content/public/browser/notification_service.h"	27 #include "content/public/browser/notification_service.h"

28 #include "content/public/test/test_utils.h"	28 #include "content/public/test/test_utils.h"

29 #include "extensions/browser/api/test/test_api.h"	29 #include "extensions/browser/api/test/test_api.h"

30 #include "extensions/browser/notification_types.h"	30 #include "extensions/browser/notification_types.h"

31 #include "google_apis/drive/drive_api_parser.h"	31 #include "google_apis/drive/drive_api_parser.h"

32 #include "google_apis/drive/test_util.h"	32 #include "google_apis/drive/test_util.h"

33 #include "net/test/embedded_test_server/embedded_test_server.h"	33 #include "net/test/embedded_test_server/embedded_test_server.h"

34 #include "storage/browser/fileapi/external_mount_points.h"	34 #include "storage/browser/fileapi/external_mount_points.h"

35	35

36 namespace file_manager {	36 namespace file_manager {

(...skipping 670 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
707 }	707 }

708	708

709 drive::DriveIntegrationService*	709 drive::DriveIntegrationService*

710 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) {	710 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) {

711 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume());	711 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume());

712 return drive_volumes_[profile->GetOriginalProfile()]	712 return drive_volumes_[profile->GetOriginalProfile()]

713 ->CreateDriveIntegrationService(profile);	713 ->CreateDriveIntegrationService(profile);

714 }	714 }

715	715

716 } // namespace file_manager	716 } // namespace file_manager

OLD	NEW