Revert of Fixing all of problems found by vc++ /analyze in GCM code

google_apis/gcm/engine/gcm_store_impl.cc

 // Copyright 2014 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 "google_apis/gcm/engine/gcm_store_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 534 matching lines @@
 
 void GCMStoreImpl::Backend::SetGServicesSettings(
     const std::map<std::string, std::string>& settings,
     const std::string& settings_digest,
     const UpdateCallback& callback) {
   leveldb::WriteBatch write_batch;
 
   // Remove all existing settings.
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
-  scoped_ptr<leveldb::Iterator> db_iter(db_->NewIterator(read_options));
-  for (db_iter->Seek(MakeSlice(kGServiceSettingKeyStart));
-       db_iter->Valid() && db_iter->key().ToString() < kGServiceSettingKeyEnd;
-       db_iter->Next()) {
-    write_batch.Delete(db_iter->key());
+  scoped_ptr<leveldb::Iterator> iter(db_->NewIterator(read_options));
+  for (iter->Seek(MakeSlice(kGServiceSettingKeyStart));
+       iter->Valid() && iter->key().ToString() < kGServiceSettingKeyEnd;
+       iter->Next()) {
+    write_batch.Delete(iter->key());
   }
 
   // Add the new settings.
   for (std::map<std::string, std::string>::const_iterator iter =
            settings.begin();
        iter != settings.end(); ++iter) {
     write_batch.Put(MakeSlice(MakeGServiceSettingKey(iter->first)),
                     MakeSlice(iter->second));
   }
 
@@ skipping 567 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm