Fix the false-positive detection of commit errors

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 52 matching lines @@
 
 using browser_sync::ChangeProcessor;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeManager;
 using browser_sync::JsBackend;
 using browser_sync::JsController;
 using browser_sync::JsEventDetails;
 using browser_sync::JsEventHandler;
 using browser_sync::SyncBackendHost;
 using browser_sync::WeakHandle;
-using browser_sync::SyncProtocolError;
+using browser_sync::SyncOperationResult;
 using sync_api::SyncCredentials;
 
 typedef GoogleServiceAuthError AuthError;
 
 const char* ProfileSyncService::kSyncServerUrl =
     "https://clients4.google.com/chrome-sync";
 
 const char* ProfileSyncService::kDevServerUrl =
     "https://clients4.google.com/chrome-sync/dev";
 
 static const int kSyncClearDataTimeoutInSeconds = 60;  // 1 minute.
 
 
 bool ShouldShowActionOnUI(
-    const browser_sync::SyncProtocolError& error) {
+    const browser_sync::SyncOperationResult& error) {
   return (error.action != browser_sync::UNKNOWN_ACTION &&
           error.action != browser_sync::DISABLE_SYNC_ON_CLIENT);
 }
 
 ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory,
                                        Profile* profile,
                                        SigninManager* signin_manager,
                                        const std::string& cros_user)
     : last_auth_error_(AuthError::None()),
       passphrase_required_reason_(sync_api::REASON_PASSPHRASE_NOT_REQUIRED),
@@ skipping 460 matching lines @@
   // TODO(akalin): Make an Observer subclass that listens and does the
   // event routing.
   sync_js_controller_.HandleJsEvent(
       "onServiceStateChanged", JsEventDetails());
 }
 
 void ProfileSyncService::ClearStaleErrors() {
   unrecoverable_error_detected_ = false;
   unrecoverable_error_message_.clear();
   unrecoverable_error_location_ = tracked_objects::Location();
-  last_actionable_error_ = SyncProtocolError();
+  last_actionable_error_ = SyncOperationResult();
 }
 
 // static
 const char* ProfileSyncService::GetPrefNameForDataType(
     syncable::ModelType data_type) {
   switch (data_type) {
     case syncable::BOOKMARKS:
       return prefs::kSyncBookmarks;
     case syncable::PASSWORDS:
       return prefs::kSyncPasswords;
@@ skipping 369 matching lines @@
 void ProfileSyncService::OnMigrationNeededForTypes(
     const syncable::ModelTypeSet& types) {
   DCHECK(backend_initialized_);
   DCHECK(data_type_manager_.get());
 
   // Migrator must be valid, because we don't sync until it is created and this
   // callback originates from a sync cycle.
   migrator_->MigrateTypes(types);
 }
 
-void ProfileSyncService::OnActionableError(const SyncProtocolError& error) {
+void ProfileSyncService::OnActionableError(const SyncOperationResult& error) {
   last_actionable_error_ = error;
   DCHECK_NE(last_actionable_error_.action,
             browser_sync::UNKNOWN_ACTION);
   switch (error.action) {
     case browser_sync::UPGRADE_CLIENT:
     case browser_sync::CLEAR_USER_DATA_AND_RESYNC:
     case browser_sync::ENABLE_SYNC_ON_ACCOUNT:
     case browser_sync::STOP_AND_RESTART_SYNC:
       // TODO(lipalani) : if setup in progress we want to display these
       // actions in the popup. The current experience might not be optimal for
@@ skipping 680 matching lines @@
         syncable::ModelTypeBitSetFromValue(
             *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
     syncable::ModelTypeSet registered;
     GetRegisteredDataTypes(&registered);
     syncable::ModelTypeBitSet registered_bit_set =
         syncable::ModelTypeBitSetFromSet(registered);
     unacknowledged = registered_bit_set & ~acknowledged;
   }
   return unacknowledged;
 }