chrome/browser/chromeos/drive/drive_system_service.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/chromeos/drive/drive_system_service.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/drive/drive_sync_client_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_system_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/drive/drive_system_service.h"	5 #include "chrome/browser/chromeos/drive/drive_system_service.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

	9 #include "base/prefs/pref_service.h"

9 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/chromeos/drive/drive_download_handler.h"	11 #include "chrome/browser/chromeos/drive/drive_download_handler.h"

11 #include "chrome/browser/chromeos/drive/drive_file_system.h"	12 #include "chrome/browser/chromeos/drive/drive_file_system.h"

12 #include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"	13 #include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"

13 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"	14 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"

14 #include "chrome/browser/chromeos/drive/drive_prefetcher.h"	15 #include "chrome/browser/chromeos/drive/drive_prefetcher.h"

15 #include "chrome/browser/chromeos/drive/drive_sync_client.h"	16 #include "chrome/browser/chromeos/drive/drive_sync_client.h"

16 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h"	17 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h"

17 #include "chrome/browser/chromeos/drive/event_logger.h"	18 #include "chrome/browser/chromeos/drive/event_logger.h"

18 #include "chrome/browser/chromeos/drive/file_write_helper.h"	19 #include "chrome/browser/chromeos/drive/file_write_helper.h"

19 #include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"	20 #include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"

20 #include "chrome/browser/download/download_service.h"	21 #include "chrome/browser/download/download_service.h"

21 #include "chrome/browser/download/download_service_factory.h"	22 #include "chrome/browser/download/download_service_factory.h"

22 #include "chrome/browser/download/download_util.h"	23 #include "chrome/browser/download/download_util.h"

23 #include "chrome/browser/google_apis/drive_api_service.h"	24 #include "chrome/browser/google_apis/drive_api_service.h"

24 #include "chrome/browser/google_apis/drive_api_util.h"	25 #include "chrome/browser/google_apis/drive_api_util.h"

25 #include "chrome/browser/google_apis/drive_uploader.h"	26 #include "chrome/browser/google_apis/drive_uploader.h"

26 #include "chrome/browser/google_apis/gdata_wapi_service.h"	27 #include "chrome/browser/google_apis/gdata_wapi_service.h"

27 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"	28 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"

28 #include "chrome/browser/prefs/pref_service.h"

29 #include "chrome/browser/profiles/profile.h"	29 #include "chrome/browser/profiles/profile.h"

30 #include "chrome/browser/profiles/profile_dependency_manager.h"	30 #include "chrome/browser/profiles/profile_dependency_manager.h"

31 #include "chrome/browser/sync/profile_sync_service.h"	31 #include "chrome/browser/sync/profile_sync_service.h"

32 #include "chrome/browser/sync/profile_sync_service_factory.h"	32 #include "chrome/browser/sync/profile_sync_service_factory.h"

33 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/chrome_version_info.h"	34 #include "chrome/common/chrome_version_info.h"

35 #include "chrome/common/pref_names.h"	35 #include "chrome/common/pref_names.h"

36 #include "content/public/browser/browser_context.h"	36 #include "content/public/browser/browser_context.h"

37 #include "content/public/browser/browser_thread.h"	37 #include "content/public/browser/browser_thread.h"

38 #include "content/public/browser/storage_partition.h"	38 #include "content/public/browser/storage_partition.h"

(...skipping 377 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
416 if (factory_for_test_.is_null())	416 if (factory_for_test_.is_null())

417 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL);	417 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL);

418 else	418 else

419 service = factory_for_test_.Run(profile);	419 service = factory_for_test_.Run(profile);

420	420

421 service->Initialize();	421 service->Initialize();

422 return service;	422 return service;

423 }	423 }

424	424

425 } // namespace drive	425 } // namespace drive

OLD	NEW