Port some more parts of browser/...

chrome/browser/safe_browsing/safe_browsing_database_bloom.cc

 // Copyright (c) 2006-2008 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/safe_browsing/safe_browsing_database_bloom.h"
 
+#include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/platform_thread.h"
 #include "base/sha2.h"
 #include "base/string_util.h"
 #include "chrome/browser/safe_browsing/bloom_filter.h"
 #include "chrome/browser/safe_browsing/chunk_range.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
 #include "googleurl/src/gurl.h"
 
 // Database version.  If this is different than what's stored on disk, the
 // database is reset.
@@ skipping 11 matching lines @@
 // down.
 static const int kOnResumeHoldupMs = 5 * 60 * 1000;  // 5 minutes.
 
 // The maximum staleness for a cached entry.
 static const int kMaxStalenessMinutes = 45;
 
 // Implementation --------------------------------------------------------------
 
 SafeBrowsingDatabaseBloom::SafeBrowsingDatabaseBloom()
     : db_(NULL),
+      transaction_count_(0),
       init_(false),
-      transaction_count_(0),
       chunk_inserted_callback_(NULL),
-#pragma warning(suppress: 4355)  // can use this
-      reset_factory_(this),
-#pragma warning(suppress: 4355)  // can use this
-      resume_factory_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(resume_factory_(this)),
       did_resume_(false) {
 }
 
 SafeBrowsingDatabaseBloom::~SafeBrowsingDatabaseBloom() {
   Close();
 }
 
 bool SafeBrowsingDatabaseBloom::Init(const std::wstring& filename,
                                     Callback0::Type* chunk_inserted_callback) {
   DCHECK(!init_ && filename_.empty());
@@ skipping 952 matching lines @@
   while (it != hash_cache_.end()) {
     HashList& entries = it->second;
     HashList::iterator eit = entries.begin();
     while (eit != entries.end()) {
       if (eit->list_id == list_id && eit->add_chunk_id == add_chunk_id)
         eit = entries.erase(eit);
       else
         ++eit;
     }
     if (entries.empty())
-      it = hash_cache_.erase(it);
+      hash_cache_.erase(it++);
     else
       ++it;
   }
 }
 
 void SafeBrowsingDatabaseBloom::HandleCorruptDatabase() {
   MessageLoop::current()->PostTask(FROM_HERE,
       reset_factory_.NewRunnableMethod(
           &SafeBrowsingDatabaseBloom::OnHandleCorruptDatabase));
 }
@@ skipping 11 matching lines @@
           &SafeBrowsingDatabaseBloom::OnResumeDone),
       kOnResumeHoldupMs);
 }
 
 void SafeBrowsingDatabaseBloom::OnResumeDone() {
   did_resume_ = false;
 }
 
 void SafeBrowsingDatabaseBloom::WaitAfterResume() {
   if (did_resume_) {
-    Sleep(kOnResumeHoldupMs);
+    PlatformThread::Sleep(kOnResumeHoldupMs);
     did_resume_ = false;
   }
 }
 
 // This database is always synchronous since we don't need to worry about
 // blocking any incoming reads.
 void SafeBrowsingDatabaseBloom::SetSynchronous() {
 }