Fix the false-positive detection of commit errors

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2483 matching lines @@
   browser_handler_map["GetActiveNotifications"] =
       &TestingAutomationProvider::GetActiveNotifications;
   browser_handler_map["CloseNotification"] =
       &TestingAutomationProvider::CloseNotification;
   browser_handler_map["WaitForNotificationCount"] =
       &TestingAutomationProvider::WaitForNotificationCount;
 
   browser_handler_map["SignInToSync"] =
       &TestingAutomationProvider::SignInToSync;
   browser_handler_map["GetSyncInfo"] = &TestingAutomationProvider::GetSyncInfo;
-  browser_handler_map["AwaitSyncCycleCompletion"] =
-      &TestingAutomationProvider::AwaitSyncCycleCompletion;
+  browser_handler_map["AwaitFullSyncCompletion"] =
+      &TestingAutomationProvider::AwaitFullSyncCompletion;
   browser_handler_map["AwaitSyncRestart"] =
       &TestingAutomationProvider::AwaitSyncRestart;
   browser_handler_map["EnableSyncForDatatypes"] =
       &TestingAutomationProvider::EnableSyncForDatatypes;
   browser_handler_map["DisableSyncForDatatypes"] =
       &TestingAutomationProvider::DisableSyncForDatatypes;
 
   browser_handler_map["GetNTPInfo"] =
       &TestingAutomationProvider::GetNTPInfo;
   browser_handler_map["MoveNTPMostVisitedThumbnail"] =
@@ skipping 2266 matching lines @@
       synced_datatype_list->Append(
           new StringValue(syncable::ModelTypeToString(*it)));
     }
     sync_info->Set("synced datatypes", synced_datatype_list);
   }
   return_value->Set("sync_info", sync_info);
   reply.SendSuccess(return_value.get());
 }
 
 // Sample json output: { "success": true }
-void TestingAutomationProvider::AwaitSyncCycleCompletion(
+void TestingAutomationProvider::AwaitFullSyncCompletion(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   if (sync_waiter_.get() == NULL) {
     sync_waiter_.reset(
         ProfileSyncServiceHarness::CreateAndAttach(browser->profile()));
   }
   if (!sync_waiter_->IsSyncAlreadySetup()) {
     reply.SendError("Not signed in to sync");
     return;
   }
   // Ensure that the profile sync service and sync backend host are initialized
   // before waiting for sync cycle completion. In cases where the browser is
   // restarted with sync enabled, these operations may still be in flight.
   if (!browser->profile()->GetProfileSyncService()) {
     reply.SendError("ProfileSyncService initialization failed.");
     return;
   }
   if (!sync_waiter_->service()->sync_initialized() &&
       !sync_waiter_->AwaitBackendInitialized()) {
     reply.SendError("Sync backend host initialization failed.");
     return;
   }
-  if (!sync_waiter_->AwaitSyncCycleCompletion("Waiting for sync cycle")) {
+  if (!sync_waiter_->AwaitFullSyncCompletion("Waiting for sync cycle")) {
     reply.SendError("Sync cycle did not complete.");
     return;
   }
   ProfileSyncService::Status status = sync_waiter_->GetStatus();
   if (status.summary == ProfileSyncService::Status::READY) {
     scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
     return_value->SetBoolean("success", true);
     reply.SendSuccess(return_value.get());
   } else {
     std::string error_msg = "Wait for sync cycle was unsuccessful. "
@@ skipping 70 matching lines @@
       std::string datatype_string;
       datatypes->GetString(i, &datatype_string);
       syncable::ModelType datatype =
           syncable::ModelTypeFromString(datatype_string);
       if (datatype == syncable::UNSPECIFIED) {
         AutomationJSONReply(this, reply_message).SendError(StringPrintf(
             "Invalid datatype string: %s.", datatype_string.c_str()));
         return;
       }
       sync_waiter_->EnableSyncForDatatype(datatype);
-      sync_waiter_->AwaitSyncCycleCompletion(StringPrintf(
+      sync_waiter_->AwaitFullSyncCompletion(StringPrintf(
           "Enabling datatype: %s", datatype_string.c_str()));
     }
   }
   ProfileSyncService::Status status = sync_waiter_->GetStatus();
   if (status.summary == ProfileSyncService::Status::READY ||
       status.summary == ProfileSyncService::Status::SYNCING) {
     scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
     return_value->SetBoolean("success", true);
     reply.SendSuccess(return_value.get());
   } else {
@@ skipping 43 matching lines @@
       std::string datatype_string;
       datatypes->GetString(i, &datatype_string);
       syncable::ModelType datatype =
           syncable::ModelTypeFromString(datatype_string);
       if (datatype == syncable::UNSPECIFIED) {
         AutomationJSONReply(this, reply_message).SendError(StringPrintf(
             "Invalid datatype string: %s.", datatype_string.c_str()));
         return;
       }
       sync_waiter_->DisableSyncForDatatype(datatype);
-      sync_waiter_->AwaitSyncCycleCompletion(StringPrintf(
+      sync_waiter_->AwaitFullSyncCompletion(StringPrintf(
           "Disabling datatype: %s", datatype_string.c_str()));
     }
     ProfileSyncService::Status status = sync_waiter_->GetStatus();
     if (status.summary == ProfileSyncService::Status::READY ||
         status.summary == ProfileSyncService::Status::SYNCING) {
       scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
       return_value->SetBoolean("success", true);
       reply.SendSuccess(return_value.get());
     } else {
       reply.SendError("Disabling sync for given datatypes was unsuccessful");
@@ skipping 1508 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }