[Sync] Convert sessions/ directory to ModelEnumSet

chrome/browser/sync/engine/sync_scheduler.cc

Index: chrome/browser/sync/engine/sync_scheduler.cc
diff --git a/chrome/browser/sync/engine/sync_scheduler.cc b/chrome/browser/sync/engine/sync_scheduler.cc
index 138abb8af26310ade8a5a8d1a526664bc503734f..5a79adbc82494373da7fec2c8f3a3a691125c286 100644
--- a/chrome/browser/sync/engine/sync_scheduler.cc
+++ b/chrome/browser/sync/engine/sync_scheduler.cc
@@ -578,13 +578,13 @@ void GetModelSafeParamsForTypes(syncable::ModelEnumSet types,
     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;