Introduce the plumbing necessary to report Unrecoverable error from model safe workers.

chrome/browser/sync/sessions/sync_session.h

 // 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.
 
 // A class representing an attempt to synchronize the local syncable data
 // store with a sync server. A SyncSession instance is passed as a stateful
 // bundle to and from various SyncerCommands with the goal of converging the
 // client view of data with that of the server. The commands twiddle with
 // session status in response to events and hiccups along the way, set and
 // query session progress with regards to conflict resolution and applying
 // server updates, and access the SyncSessionContext for the current session
 // via SyncSession instances.
 
 #ifndef CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_
 #define CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/location.h"
 #include "base/time.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/sessions/ordered_commit_set.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/sessions/status_controller.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
+#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/util/extensions_activity_monitor.h"
 
 namespace syncable {
 class WriteTransaction;
 }
 
 namespace browser_sync {
 class ModelSafeWorker;
 
@@ skipping 42 matching lines @@
     // stops the current sync cycle and purges the client. In the new model
     // the former would be done by the |SyncProtocolError| and
     // the latter(which is an action) would be done in ProfileSyncService
     // along with the rest of the actions.
     virtual void OnShouldStopSyncingPermanently() = 0;
 
     // Called for the syncer to respond to the error sent by the server.
     virtual void OnSyncProtocolError(
         const sessions::SyncSessionSnapshot& snapshot) = 0;
 
+    // Called when the syncer encounters an unrecoverable error.
+    virtual void OnUnrecoverableError(
+        const tracked_objects::Location& from_here,
+        const std::string& message) = 0;
+
    protected:
     virtual ~Delegate() {}
   };
 
   SyncSession(SyncSessionContext* context,
               Delegate* delegate,
               const SyncSourceInfo& source,
               const ModelSafeRoutingInfo& routing_info,
               const std::vector<ModelSafeWorker*>& workers);
   ~SyncSession();
@@ skipping 36 matching lines @@
 
   // Volatile reader for the source member of the sync session object.  The
   // value is set to the SYNC_CYCLE_CONTINUATION value to signal that it has
   // been read.
   SyncSourceInfo TestAndSetSource();
 
   const std::vector<ModelSafeWorker*>& workers() const { return workers_; }
   const ModelSafeRoutingInfo& routing_info() const { return routing_info_; }
   const SyncSourceInfo& source() const { return source_; }
 
+  // This can be called from any thread. We just cache the value of
+  // unrecoverable error info. When on the correct thread using this info
+  // delegate's OnUnrecoverableError method should be called.
+  void SetUnrecoverableError(const tracked_objects::Location& location,
+      const std::string& message,
+      syncable::BaseTransaction* trans);
+
+  bool unrecoverable_error() const { return unrecoverable_error_; }
+  UnrecoverableErrorInfo* unrecoverable_error_info() {
+    return unrecoverable_error_info_.get();
+  }
+
  private:
   // Extend the encapsulation boundary to utilities for internal member
   // assignments. This way, the scope of these actions is explicit, they can't
   // be overridden, and assigning is always accompanied by unassigning.
   friend class ScopedSetSessionWriteTransaction;
 
   // The context for this session, guaranteed to outlive |this|.
   SyncSessionContext* const context_;
 
   // The source for initiating this sync session.
@@ skipping 13 matching lines @@
 
   // The set of active ModelSafeWorkers for the duration of this session.
   // This can change if this session is Coalesce()'d with another.
   std::vector<ModelSafeWorker*> workers_;
 
   // The routing info for the duration of this session, dictating which
   // datatypes should be synced and which workers should be used when working
   // on those datatypes.
   ModelSafeRoutingInfo routing_info_;
 
+  scoped_ptr<UnrecoverableErrorInfo> unrecoverable_error_info_;
+  bool unrecoverable_error_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSession);
 };
 
 // Installs a WriteTransaction to a given session and later clears it when the
 // utility falls out of scope. Transactions are not nestable, so it is an error
 // to try and use one of these if the session already has a transaction.
 class ScopedSetSessionWriteTransaction {
  public:
   ScopedSetSessionWriteTransaction(SyncSession* session,
                                    syncable::WriteTransaction* trans)
       : session_(session) {
     DCHECK(!session_->write_transaction_);
     session_->write_transaction_ = trans;
   }
   ~ScopedSetSessionWriteTransaction() { session_->write_transaction_ = NULL; }
 
  private:
   SyncSession* session_;
   DISALLOW_COPY_AND_ASSIGN(ScopedSetSessionWriteTransaction);
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_H_