Reland 127510 - Enable tab sync on all platforms by default.

chrome/browser/sync/internal_api/sync_manager.cc

 // Copyright (c) 2012 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/bind.h"
@@ skipping 1166 matching lines @@
 
 void SyncManager::SyncInternal::MaybeSetSyncTabsInNigoriNode(
     const ModelTypeSet enabled_types) {
   // The initialized_ check is to ensure that we don't CHECK in GetUserShare
   // when this is called on start-up. It's ok to ignore that case, since
   // presumably this would've run when the user originally enabled sessions.
   if (initialized_ && enabled_types.Has(syncable::SESSIONS)) {
     WriteTransaction trans(FROM_HERE, GetUserShare());
     WriteNode node(&trans);
     if (!node.InitByTagLookup(kNigoriTag)) {
-      NOTREACHED() << "Unable to set 'sync_tabs' bit because Nigori node not "
+      LOG(WARNING) << "Unable to set 'sync_tabs' bit because Nigori node not "
                    << "found.";
       return;
     }
 
     sync_pb::NigoriSpecifics specifics(node.GetNigoriSpecifics());
     specifics.set_sync_tabs(true);
     node.SetNigoriSpecifics(specifics);
   }
 }
 
@@ skipping 1287 matching lines @@
     share->directory->GetDownloadProgress(i.Get(), &marker);
 
     if (marker.token().empty())
       result.Put(i.Get());
 
   }
   return result;
 }
 
 }  // namespace sync_api