Revert the revert. This change was not the cause of the failures, so relanding.

chrome/browser/sync/internal_api/sync_manager.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/internal_api/sync_manager.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 917 matching lines @@
   std::string state;
   if (lookup.good()) {
     unique_id = lookup->cache_guid();
     state = lookup->GetNotificationState();
     VLOG(1) << "Read notification unique ID: " << unique_id;
     if (VLOG_IS_ON(1)) {
       std::string encoded_state;
       base::Base64Encode(state, &encoded_state);
       VLOG(1) << "Read notification state: " << encoded_state;
     }
+    allstatus_.SetUniqueId(unique_id);
   } else {
     LOG(ERROR) << "Could not read notification unique ID/state";
   }
   sync_notifier_->SetUniqueId(unique_id);
   sync_notifier_->SetState(state);
 
   UpdateCredentials(credentials);
   UpdateEnabledTypes();
   return true;
 }
@@ skipping 1160 matching lines @@
     lookup->GetDownloadProgress(*i, &marker);
 
     if (marker.token().empty())
       result.insert(*i);
 
   }
   return result;
 }
 
 }  // namespace sync_api