[Sync] Convert sessions/ directory to ModelEnumSet

chrome/browser/sync/engine/sync_scheduler.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/engine/sync_scheduler.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/bind.h"
@@ skipping 560 matching lines @@
   registrar->GetWorkers(&w_tmp);
 
   bool passive_group_added = false;
 
   typedef std::vector<ModelSafeWorker*>::const_iterator iter;
   for (syncable::ModelEnumSet::Iterator it = types.First();
        it.Good(); it.Inc()) {
     const syncable::ModelType t = it.Get();
     DCHECK_EQ(1U, r_tmp.count(t));
     (*routes)[t] = r_tmp[t];
-    iter w_tmp_it = std::find_if(w_tmp.begin(), w_tmp.end(),
-                                 ModelSafeWorkerGroupIs(r_tmp[t]));
-    if (w_tmp_it != w_tmp.end()) {
-      iter workers_it = std::find_if(workers->begin(), workers->end(),
-                                     ModelSafeWorkerGroupIs(r_tmp[t]));
-      if (workers_it == workers->end())
-        workers->push_back(*w_tmp_it);
+    iter it = std::find_if(w_tmp.begin(), w_tmp.end(),
+                           ModelSafeWorkerGroupIs(r_tmp[t]));
+    if (it != w_tmp.end()) {
+      iter it2 = std::find_if(workers->begin(), workers->end(),
+                              ModelSafeWorkerGroupIs(r_tmp[t]));
+      if (it2 == workers->end())

[Nicolas Zea, 2011/12/06 19:41:40]

this file is already modified in your other patch isn't it?

[akalin, 2011/12/06 19:46:08]

Hmm yeah it should be.  I'll reupload a patch...

+        workers->push_back(*it);
 
       if (r_tmp[t] == GROUP_PASSIVE)
         passive_group_added = true;
     } else {
         NOTREACHED();
     }
   }
 
   // Always add group passive.
   if (passive_group_added == false) {
@@ skipping 588 matching lines @@
 
 #undef SDVLOG_LOC
 
 #undef SDVLOG
 
 #undef SLOG
 
 #undef ENUM_CASE
 
 }  // browser_sync