Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service_factory.cc

Issue 145693005: [FileAPI] Replace default leveldb::Env with leveldb::MemEnv in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/sync_file_system/sync_file_system_service_factory.h" 5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" 9 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
10 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {} 54 SyncFileSystemServiceFactory::~SyncFileSystemServiceFactory() {}
55 55
56 BrowserContextKeyedService* 56 BrowserContextKeyedService*
57 SyncFileSystemServiceFactory::BuildServiceInstanceFor( 57 SyncFileSystemServiceFactory::BuildServiceInstanceFor(
58 content::BrowserContext* context) const { 58 content::BrowserContext* context) const {
59 Profile* profile = Profile::FromBrowserContext(context); 59 Profile* profile = Profile::FromBrowserContext(context);
60 60
61 SyncFileSystemService* service = new SyncFileSystemService(profile); 61 SyncFileSystemService* service = new SyncFileSystemService(profile);
62 62
63 scoped_ptr<LocalFileSyncService> local_file_service( 63 scoped_ptr<LocalFileSyncService> local_file_service =
64 new LocalFileSyncService(profile)); 64 LocalFileSyncService::Create(profile);
65 65
66 scoped_ptr<RemoteFileSyncService> remote_file_service; 66 scoped_ptr<RemoteFileSyncService> remote_file_service;
67 if (mock_remote_file_service_) { 67 if (mock_remote_file_service_) {
68 remote_file_service = mock_remote_file_service_.Pass(); 68 remote_file_service = mock_remote_file_service_.Pass();
69 } else if (IsV2Enabled()) { 69 } else if (IsV2Enabled()) {
70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( 70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
71 RemoteFileSyncService::V2, context); 71 RemoteFileSyncService::V2, context);
72 } else { 72 } else {
73 remote_file_service = RemoteFileSyncService::CreateForBrowserContext( 73 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
74 RemoteFileSyncService::V1, context); 74 RemoteFileSyncService::V1, context);
75 } 75 }
76 76
77 if (CommandLine::ForCurrentProcess()->HasSwitch(kDisableLastWriteWin)) { 77 if (CommandLine::ForCurrentProcess()->HasSwitch(kDisableLastWriteWin)) {
78 remote_file_service->SetConflictResolutionPolicy( 78 remote_file_service->SetConflictResolutionPolicy(
79 CONFLICT_RESOLUTION_POLICY_MANUAL); 79 CONFLICT_RESOLUTION_POLICY_MANUAL);
80 } 80 }
81 81
82 service->Initialize(local_file_service.Pass(), 82 service->Initialize(local_file_service.Pass(),
83 remote_file_service.Pass()); 83 remote_file_service.Pass());
84 return service; 84 return service;
85 } 85 }
86 86
87 } // namespace sync_file_system 87 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698