Fix CallbackRegistry on Win7

base/callback_registry.h

 // Copyright 2013 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.
 
 #ifndef BASE_CALLBACK_REGISTRY_H_
 #define BASE_CALLBACK_REGISTRY_H_
 
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 107 matching lines @@
     ~Iterator() {
       if (list_ && --list_->active_iterator_count_ == 0) {
         list_->Compact();
       }
     }
 
     CallbackType* GetNext() {
       while ((list_iter_ != list_->callbacks_.end()) && list_iter_->is_null())
         ++list_iter_;
 
-      CallbackType* cb =
-          list_iter_ != list_->callbacks_.end() ? &(*list_iter_) : NULL;
-      ++list_iter_;
+      CallbackType* cb = NULL;
+      if (list_iter_ != list_->callbacks_.end()) {
+        cb = &(*list_iter_);
+        ++list_iter_;
+      }
       return cb;
     }
 
    private:
     CallbackRegistryBase<CallbackType>* list_;
     typename std::list<CallbackType>::iterator list_iter_;
   };
 
   CallbackRegistryBase()
       : active_iterator_count_(0) {}
@@ skipping 64 matching lines @@
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
 };
 
 }  // namespace base
 
 #endif  // BASE_CALLBACK_REGISTRY_H_