Fix the false-positive detection of commit errors

chrome/browser/sync/test/integration/sync_test.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/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 608 matching lines @@
   std::string path = "chromiumsync/transienterror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Transient error",
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
 namespace {
 
 sync_pb::ClientToServerResponse::ErrorType
     GetClientToServerResponseErrorType(
-        browser_sync::SyncProtocolErrorType error) {
+        browser_sync::SyncOperationResultType error) {
   switch (error) {
-    case browser_sync::SYNC_SUCCESS:
+    case browser_sync::OPERATION_SUCCESS:
       return sync_pb::ClientToServerResponse::SUCCESS;
     case browser_sync::NOT_MY_BIRTHDAY:
       return sync_pb::ClientToServerResponse::NOT_MY_BIRTHDAY;
     case browser_sync::THROTTLED:
       return sync_pb::ClientToServerResponse::THROTTLED;
     case browser_sync::CLEAR_PENDING:
       return sync_pb::ClientToServerResponse::CLEAR_PENDING;
     case browser_sync::TRANSIENT_ERROR:
       return sync_pb::ClientToServerResponse::TRANSIENT_ERROR;
     case browser_sync::MIGRATION_DONE:
@@ skipping 23 matching lines @@
     case browser_sync::UNKNOWN_ACTION:
       return sync_pb::ClientToServerResponse::Error::UNKNOWN_ACTION;
     default:
       NOTREACHED();
       return sync_pb::ClientToServerResponse::Error::UNKNOWN_ACTION;
   }
 }
 
 }  // namespace
 
-void SyncTest::TriggerSyncError(const browser_sync::SyncProtocolError& error) {
+void SyncTest::TriggerSyncError(const browser_sync::SyncOperationResult& error) {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/error";
   int error_type =
       static_cast<int>(GetClientToServerResponseErrorType(
           error.error_type));
   int action = static_cast<int>(GetClientToServerResponseAction(
       error.action));
 
   path.append(base::StringPrintf("?error=%d", error_type));
   path.append(base::StringPrintf("&action=%d", action));
@@ skipping 19 matching lines @@
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }