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

Side by Side Diff: ios/chrome/browser/sync/ios_chrome_sync_client.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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
OLDNEW
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 "ios/chrome/browser/sync/ios_chrome_sync_client.h" 5 #include "ios/chrome/browser/sync/ios_chrome_sync_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h"
12 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service .h" 13 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service .h"
13 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h" 14 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h"
14 #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_sync able_service.h" 15 #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_sync able_service.h"
15 #include "components/autofill/core/browser/webdata/autofill_wallet_syncable_serv ice.h" 16 #include "components/autofill/core/browser/webdata/autofill_wallet_syncable_serv ice.h"
16 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" 17 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
17 #include "components/browser_sync/browser/profile_sync_components_factory_impl.h " 18 #include "components/browser_sync/browser/profile_sync_components_factory_impl.h "
18 #include "components/browser_sync/browser/profile_sync_service.h" 19 #include "components/browser_sync/browser/profile_sync_service.h"
19 #include "components/browser_sync/common/browser_sync_switches.h" 20 #include "components/browser_sync/common/browser_sync_switches.h"
20 #include "components/dom_distiller/core/dom_distiller_service.h" 21 #include "components/dom_distiller/core/dom_distiller_service.h"
21 #include "components/history/core/browser/history_model_worker.h" 22 #include "components/history/core/browser/history_model_worker.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 104 }
104 return url.is_valid() && !url.SchemeIs(kChromeUIScheme) && 105 return url.is_valid() && !url.SchemeIs(kChromeUIScheme) &&
105 !url.SchemeIsFile(); 106 !url.SchemeIsFile();
106 } 107 }
107 108
108 browser_sync::SyncedWindowDelegatesGetter* GetSyncedWindowDelegatesGetter() 109 browser_sync::SyncedWindowDelegatesGetter* GetSyncedWindowDelegatesGetter()
109 override { 110 override {
110 return window_delegates_getter_.get(); 111 return window_delegates_getter_.get();
111 } 112 }
112 113
113 scoped_ptr<browser_sync::LocalSessionEventRouter> GetLocalSessionEventRouter() 114 std::unique_ptr<browser_sync::LocalSessionEventRouter>
114 override { 115 GetLocalSessionEventRouter() override {
115 syncer::SyncableService::StartSyncFlare flare( 116 syncer::SyncableService::StartSyncFlare flare(
116 ios::sync_start_util::GetFlareForSyncableService( 117 ios::sync_start_util::GetFlareForSyncableService(
117 browser_state_->GetStatePath())); 118 browser_state_->GetStatePath()));
118 return make_scoped_ptr( 119 return base::WrapUnique(
119 new IOSChromeLocalSessionEventRouter(browser_state_, this, flare)); 120 new IOSChromeLocalSessionEventRouter(browser_state_, this, flare));
120 } 121 }
121 122
122 private: 123 private:
123 ios::ChromeBrowserState* const browser_state_; 124 ios::ChromeBrowserState* const browser_state_;
124 const scoped_ptr<browser_sync::SyncedWindowDelegatesGetter> 125 const std::unique_ptr<browser_sync::SyncedWindowDelegatesGetter>
125 window_delegates_getter_; 126 window_delegates_getter_;
126 127
127 DISALLOW_COPY_AND_ASSIGN(SyncSessionsClientImpl); 128 DISALLOW_COPY_AND_ASSIGN(SyncSessionsClientImpl);
128 }; 129 };
129 130
130 } // namespace 131 } // namespace
131 132
132 IOSChromeSyncClient::IOSChromeSyncClient(ios::ChromeBrowserState* browser_state) 133 IOSChromeSyncClient::IOSChromeSyncClient(ios::ChromeBrowserState* browser_state)
133 : browser_state_(browser_state), 134 : browser_state_(browser_state),
134 sync_sessions_client_(new SyncSessionsClientImpl(browser_state)), 135 sync_sessions_client_(new SyncSessionsClientImpl(browser_state)),
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 return nullptr; 375 return nullptr;
375 } 376 }
376 } 377 }
377 378
378 sync_driver::SyncApiComponentFactory* 379 sync_driver::SyncApiComponentFactory*
379 IOSChromeSyncClient::GetSyncApiComponentFactory() { 380 IOSChromeSyncClient::GetSyncApiComponentFactory() {
380 return component_factory_.get(); 381 return component_factory_.get();
381 } 382 }
382 383
383 void IOSChromeSyncClient::SetSyncApiComponentFactoryForTesting( 384 void IOSChromeSyncClient::SetSyncApiComponentFactoryForTesting(
384 scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory) { 385 std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory) {
385 component_factory_ = std::move(component_factory); 386 component_factory_ = std::move(component_factory);
386 } 387 }
387 388
388 // static 389 // static
389 void IOSChromeSyncClient::GetDeviceInfoTrackers( 390 void IOSChromeSyncClient::GetDeviceInfoTrackers(
390 std::vector<const sync_driver::DeviceInfoTracker*>* trackers) { 391 std::vector<const sync_driver::DeviceInfoTracker*>* trackers) {
391 DCHECK(trackers); 392 DCHECK(trackers);
392 std::vector<ios::ChromeBrowserState*> browser_state_list = 393 std::vector<ios::ChromeBrowserState*> browser_state_list =
393 GetApplicationContext() 394 GetApplicationContext()
394 ->GetChromeBrowserStateManager() 395 ->GetChromeBrowserStateManager()
395 ->GetLoadedBrowserStates(); 396 ->GetLoadedBrowserStates();
396 for (ios::ChromeBrowserState* browser_state : browser_state_list) { 397 for (ios::ChromeBrowserState* browser_state : browser_state_list) {
397 ProfileSyncService* profile_sync_service = 398 ProfileSyncService* profile_sync_service =
398 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state); 399 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state);
399 if (profile_sync_service != nullptr) { 400 if (profile_sync_service != nullptr) {
400 const sync_driver::DeviceInfoTracker* tracker = 401 const sync_driver::DeviceInfoTracker* tracker =
401 profile_sync_service->GetDeviceInfoTracker(); 402 profile_sync_service->GetDeviceInfoTracker();
402 if (tracker != nullptr) { 403 if (tracker != nullptr) {
403 trackers->push_back(tracker); 404 trackers->push_back(tracker);
404 } 405 }
405 } 406 }
406 } 407 }
407 } 408 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698