Fix for negative routing info problem. We were replacing tokens after

chrome/browser/sync/sessions/status_controller.h

 // Copyright (c) 2009 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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
@@ skipping 133 matching lines @@
   bool HasConflictingUpdates() const;
 
   // Aggregate sum of ConflictingItemSize() over all ConflictProgress objects
   // (one for each ModelSafeGroup currently in-use).
   int TotalNumConflictingItems() const;
 
   // Returns the number of updates received from the sync server.
   int64 CountUpdates() const;
 
   // Returns true iff any of the commit ids added during this session are
-  // bookmark related.
+  // bookmark related, and the bookmark group restriction is in effect.
   bool HasBookmarkCommitActivity() const {
-    return shared_.commit_set.HasBookmarkCommitId();
+    return ActiveGroupRestrictionIncludesModel(syncable::BOOKMARKS) &&
+        shared_.commit_set.HasBookmarkCommitId();
   }
 
   // Returns true if the last download_updates_command received a valid
   // server response.
   bool download_updates_succeeded() const {
     return updates_response().has_get_updates();
   }
 
   // Returns true if the last updates response indicated that we were fully
   // up to date.  This is subtle: if it's false, it could either mean that
   // the server said there WAS more to download, or it could mean that we
   // were unable to reach the server.
   bool server_says_nothing_more_to_download() const {
     if (!download_updates_succeeded())
       return false;
     // The server indicates "you're up to date" by not sending a new
     // timestamp.
     return !updates_response().get_updates().has_new_timestamp();
   }
 
   ModelSafeGroup group_restriction() const {
     return group_restriction_;
   }
 
+  // Check whether a particular model is included by the active group
+  // restriction.
+  bool ActiveGroupRestrictionIncludesModel(syncable::ModelType model) const {
+    DCHECK(group_restriction_in_effect_);
+    ModelSafeRoutingInfo::const_iterator it = routing_info_.find(model);
+    if (it == routing_info_.end())
+      return false;
+    return group_restriction() == it->second;
+  }
+
   // A toolbelt full of methods for updating counters and flags.
   void increment_num_conflicting_commits_by(int value);
   void reset_num_conflicting_commits();
   void set_num_consecutive_transient_error_commits(int value);
   void increment_num_consecutive_transient_error_commits_by(int value);
   void set_num_consecutive_errors(int value);
   void increment_num_consecutive_errors();
   void increment_num_consecutive_errors_by(int value);
   void set_current_sync_timestamp(syncable::ModelType model,
                                   int64 current_timestamp);
@@ skipping 67 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }
 }
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_STATUS_CONTROLLER_H_