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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 1275743002: [Sync] Remove backend unrecoverable error handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix leak Created 5 years, 4 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 (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/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 } 518 }
519 519
520 SyncCredentials credentials = GetCredentials(); 520 SyncCredentials credentials = GetCredentials();
521 521
522 scoped_refptr<net::URLRequestContextGetter> request_context_getter( 522 scoped_refptr<net::URLRequestContextGetter> request_context_getter(
523 profile_->GetRequestContext()); 523 profile_->GetRequestContext());
524 524
525 if (backend_mode_ == SYNC && delete_stale_data) 525 if (backend_mode_ == SYNC && delete_stale_data)
526 ClearStaleErrors(); 526 ClearStaleErrors();
527 527
528 scoped_ptr<syncer::UnrecoverableErrorHandler>
529 backend_unrecoverable_error_handler(
530 new browser_sync::BackendUnrecoverableErrorHandler(
531 MakeWeakHandle(weak_factory_.GetWeakPtr())));
532
533 backend_->Initialize(this, sync_thread_.Pass(), GetJsEventHandler(), 528 backend_->Initialize(this, sync_thread_.Pass(), GetJsEventHandler(),
534 sync_service_url_, credentials, delete_stale_data, 529 sync_service_url_, credentials, delete_stale_data,
535 scoped_ptr<syncer::SyncManagerFactory>( 530 scoped_ptr<syncer::SyncManagerFactory>(
536 new syncer::SyncManagerFactory(GetManagerType())) 531 new syncer::SyncManagerFactory(GetManagerType()))
537 .Pass(), 532 .Pass(),
538 backend_unrecoverable_error_handler.Pass(), 533 MakeWeakHandle(weak_factory_.GetWeakPtr()),
539 base::Bind(browser_sync::ChromeReportUnrecoverableError), 534 base::Bind(browser_sync::ChromeReportUnrecoverableError),
540 network_resources_.get(), saved_nigori_state_.Pass()); 535 network_resources_.get(), saved_nigori_state_.Pass());
541 } 536 }
542 537
543 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const { 538 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
544 if (encryption_pending()) 539 if (encryption_pending())
545 return true; 540 return true;
546 const syncer::ModelTypeSet preferred_types = GetPreferredDataTypes(); 541 const syncer::ModelTypeSet preferred_types = GetPreferredDataTypes();
547 const syncer::ModelTypeSet encrypted_types = GetEncryptedDataTypes(); 542 const syncer::ModelTypeSet encrypted_types = GetEncryptedDataTypes();
548 DCHECK(encrypted_types.Has(syncer::PASSWORDS)); 543 DCHECK(encrypted_types.Has(syncer::PASSWORDS));
(...skipping 2172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2721 } else { 2716 } else {
2722 UMA_HISTOGRAM_COUNTS("Sync.MemoryPressureWarningBeforeCleanShutdown", 2717 UMA_HISTOGRAM_COUNTS("Sync.MemoryPressureWarningBeforeCleanShutdown",
2723 warning_received); 2718 warning_received);
2724 } 2719 }
2725 } 2720 }
2726 sync_prefs_.SetMemoryPressureWarningCount(0); 2721 sync_prefs_.SetMemoryPressureWarningCount(0);
2727 // Will set to true during a clean shutdown, so crash or something else will 2722 // Will set to true during a clean shutdown, so crash or something else will
2728 // remain this as false. 2723 // remain this as false.
2729 sync_prefs_.SetCleanShutdown(false); 2724 sync_prefs_.SetCleanShutdown(false);
2730 } 2725 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698