Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook...

chrome/browser/sync/glue/session_change_processor.cc

 // Copyright (c) 2010 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/glue/session_change_processor.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/scoped_vector.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
-#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 
 namespace browser_sync {
 
 SessionChangeProcessor::SessionChangeProcessor(
     UnrecoverableErrorHandler* error_handler,
     SessionModelAssociator* session_model_associator)
     : ChangeProcessor(error_handler),
       session_model_associator_(session_model_associator),
       profile_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(error_handler);
   DCHECK(session_model_associator_);
 }
 
-SessionChangeProcessor::SessionChangeProcessor(
-    UnrecoverableErrorHandler* error_handler,
-    SessionModelAssociator* session_model_associator,
-    bool setup_for_test)
-    : ChangeProcessor(error_handler),
-      session_model_associator_(session_model_associator),
-      profile_(NULL),
-      setup_for_test_(setup_for_test) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(error_handler);
-  DCHECK(session_model_associator_);
-}
-
 SessionChangeProcessor::~SessionChangeProcessor() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void SessionChangeProcessor::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(running());
   DCHECK(profile_);
@@ skipping 132 matching lines @@
           "Session node lookup failed.");
       return;
     }
 
     // Check that the changed node is a child of the session folder.
     DCHECK(root.GetId() == sync_node.GetParentId());
     DCHECK(syncable::SESSIONS == sync_node.GetModelType());
 
     const sync_pb::SessionSpecifics& specifics(
         sync_node.GetSessionSpecifics());
-    if (specifics.session_tag() ==
-            session_model_associator_->GetCurrentMachineTag() &&
-        !setup_for_test_) {
-      // We should only ever receive a change to our own machine's session info
-      // if encryption was turned on. In that case, the data is still the same,
-      // so we can ignore.
-      LOG(WARNING) << "Dropping modification to local session.";
-      return;
-    }
     const int64 mtime = sync_node.GetModificationTime();
     // Model associator handles foreign session update and add the same.
     session_model_associator_->AssociateForeignSpecifics(specifics, mtime);
   }
 
   // Notify foreign session handlers that there are new sessions.
   NotificationService::current()->Notify(
       NotificationType::FOREIGN_SESSION_UPDATED,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
@@ skipping 35 matching lines @@
       NotificationService::AllSources());
 }
 
 void SessionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync