Fourth patch in getting rid of caching MessageLoop pointers.

chrome/browser/safe_browsing/protocol_manager.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/protocol_manager.h"
 
 #include "base/file_version_info.h"
 #include "base/histogram.h"
 #include "base/logging.h"
-#include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/task.h"
 #include "base/timer.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/env_vars.h"
 #include "net/base/base64.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 33 matching lines @@
 #endif
 
 // Maximum back off multiplier.
 static const int kSbMaxBackOff = 8;
 
 
 // SafeBrowsingProtocolManager implementation ----------------------------------
 
 SafeBrowsingProtocolManager::SafeBrowsingProtocolManager(
     SafeBrowsingService* sb_service,
-    MessageLoop* notify_loop,
     const std::string& client_key,
     const std::string& wrapped_key)
     : sb_service_(sb_service),
       request_type_(NO_REQUEST),
       update_error_count_(0),
       gethash_error_count_(0),
       update_back_off_mult_(1),
       gethash_back_off_mult_(1),
       next_update_sec_(-1),
       update_state_(FIRST_REQUEST),
       initial_request_(true),
       chunk_pending_to_write_(false),
-      notify_loop_(notify_loop),
       client_key_(client_key),
       wrapped_key_(wrapped_key),
       update_size_(0) {
   // Set the backoff multiplier fuzz to a random value between 0 and 1.
   back_off_fuzz_ = static_cast<float>(base::RandDouble());
 
   // The first update must happen between 0-5 minutes of start up.
   next_update_sec_ = base::RandInt(60, kSbTimerStartIntervalSec);
 
   scoped_ptr<FileVersionInfo> version_info(
@@ skipping 322 matching lines @@
 
       break;
     }
     case GETKEY_REQUEST: {
       std::string client_key, wrapped_key;
       if (!parser.ParseNewKey(data, length, &client_key, &wrapped_key))
         return false;
 
       client_key_ = client_key;
       wrapped_key_ = wrapped_key;
-      notify_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-          sb_service_, &SafeBrowsingService::OnNewMacKeys, client_key_,
-          wrapped_key_));
+      ChromeThread::PostTask(
+          ChromeThread::UI, FROM_HERE,
+          NewRunnableMethod(
+              sb_service_, &SafeBrowsingService::OnNewMacKeys, client_key_,
+              wrapped_key_));
       break;
     }
 
     default:
       return false;
   }
 
   return true;
 }
 
@@ skipping 219 matching lines @@
 void SafeBrowsingProtocolManager::HandleGetHashError(const Time& now) {
   int next = GetNextBackOffTime(&gethash_error_count_, &gethash_back_off_mult_);
   next_gethash_time_ = now + TimeDelta::FromSeconds(next);
 }
 
 void SafeBrowsingProtocolManager::UpdateFinished(bool success) {
   UMA_HISTOGRAM_COUNTS("SB2.UpdateSize", update_size_);
   update_size_ = 0;
   sb_service_->UpdateFinished(success);
 }