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

Side by Side Diff: components/sync/tools/sync_client.cc

Issue 2317023003: sync and signin: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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
« no previous file with comments | « components/sync/syncable/syncable_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <cstdio> 8 #include <cstdio>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 LoggingChangeDelegate change_delegate; 409 LoggingChangeDelegate change_delegate;
410 const char kRestoredKeyForBootstrapping[] = ""; 410 const char kRestoredKeyForBootstrapping[] = "";
411 const char kRestoredKeystoreKeyForBootstrapping[] = ""; 411 const char kRestoredKeystoreKeyForBootstrapping[] = "";
412 NullEncryptor null_encryptor; 412 NullEncryptor null_encryptor;
413 InternalComponentsFactoryImpl::Switches factory_switches = { 413 InternalComponentsFactoryImpl::Switches factory_switches = {
414 InternalComponentsFactory::ENCRYPTION_KEYSTORE, 414 InternalComponentsFactory::ENCRYPTION_KEYSTORE,
415 InternalComponentsFactory::BACKOFF_NORMAL}; 415 InternalComponentsFactory::BACKOFF_NORMAL};
416 CancelationSignal scm_cancelation_signal; 416 CancelationSignal scm_cancelation_signal;
417 417
418 SyncManager::InitArgs args; 418 SyncManager::InitArgs args;
419 args.database_location = database_dir.path(); 419 args.database_location = database_dir.GetPath();
420 args.event_handler = WeakHandle<JsEventHandler>(js_event_handler.AsWeakPtr()); 420 args.event_handler = WeakHandle<JsEventHandler>(js_event_handler.AsWeakPtr());
421 args.service_url = GURL(kSyncServiceURL); 421 args.service_url = GURL(kSyncServiceURL);
422 args.post_factory = std::move(post_factory); 422 args.post_factory = std::move(post_factory);
423 args.workers = workers; 423 args.workers = workers;
424 args.extensions_activity = extensions_activity; 424 args.extensions_activity = extensions_activity;
425 args.change_delegate = &change_delegate; 425 args.change_delegate = &change_delegate;
426 args.credentials = credentials; 426 args.credentials = credentials;
427 args.invalidator_client_id = invalidator_id; 427 args.invalidator_client_id = invalidator_id;
428 args.restored_key_for_bootstrapping = kRestoredKeyForBootstrapping; 428 args.restored_key_for_bootstrapping = kRestoredKeyForBootstrapping;
429 args.restored_keystore_key_for_bootstrapping = 429 args.restored_keystore_key_for_bootstrapping =
(...skipping 21 matching lines...) Expand all
451 io_thread.Stop(); 451 io_thread.Stop();
452 return 0; 452 return 0;
453 } 453 }
454 454
455 } // namespace 455 } // namespace
456 } // namespace syncer 456 } // namespace syncer
457 457
458 int main(int argc, char* argv[]) { 458 int main(int argc, char* argv[]) {
459 return syncer::SyncClientMain(argc, argv); 459 return syncer::SyncClientMain(argc, argv);
460 } 460 }
OLDNEW
« no previous file with comments | « components/sync/syncable/syncable_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698