Porting refactoring changes:...

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/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/rand_util.h"
 #include "base/string_util.h"
+#include "base/sys_info.h"
 #include "base/task.h"
 #include "base/timer.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_util.h"
 #include "chrome/common/env_vars.h"
-#include "chrome/common/rand_util.h"
 #include "chrome/common/stl_util-inl.h"
 #include "net/base/base64.h"
 #include "net/base/load_flags.h"
 
 
 // Maximum time, in seconds, from start up before we must issue an update query.
 static const int kSbTimerStartIntervalSec = 300;

[Mark Mentovai, 2008/09/29 22:20:05]

Changed this to 5 * 60 for improved awesomeness.

 
 // Update URL for querying about the latest set of chunk updates.
 static const char* const kSbUpdateUrl =
     "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=%s&appver=%d.%d&pver=2.1";
 
 // GetHash request URL for retrieving full hashes.
 static const char* const kSbGetHashUrl =
     "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=%s&appver=%d.%d&pver=2.1";
 
 // New MAC client key requests URL.
@@ skipping 26 matching lines @@
       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) {
   // Set the backoff multiplier fuzz to a random value between 0 and 1.
-  back_off_fuzz_ = static_cast<float>(rand_util::RandInt(1, INT_MAX)) / INT_MAX;
+  back_off_fuzz_ = base::RandDouble();

[Mark Mentovai, 2008/09/29 22:20:05]

MSVC still requires static_cast<float> here, "possible loss of precision."  We
may actually want to make back_off_fuzz_ a double, I don't know, I'm just trying
to do the least invasive thing possible for these final fixes.  back_off_fuzz_
doesn't actually seem to need the precision of a double, the only gain would be
getting rid of the cast because our random interface uses double.

 
   // The first update must happen between 0-5 minutes of start up.
-  next_update_sec_ = rand_util::RandInt(60, kSbTimerStartIntervalSec);
+  next_update_sec_ = base::RandInt(60, kSbTimerStartIntervalSec);
 }
 
 SafeBrowsingProtocolManager::~SafeBrowsingProtocolManager() {
   // Delete in-progress SafeBrowsing requests.
   STLDeleteContainerPairFirstPointers(hash_requests_.begin(),
                                       hash_requests_.end());
   hash_requests_.clear();
 }
 
 // Public API used by the SafeBrowsingService ----------------------------------
@@ skipping 183 matching lines @@
 
       if (update_state_ == FIRST_REQUEST)
         update_state_ = SECOND_REQUEST;
       else if (update_state_ == SECOND_REQUEST)
         update_state_ = NORMAL_REQUEST;
 
       // New time for the next update.
       if (next_update_sec > 0) {
         next_update_sec_ = next_update_sec;
       } else if (update_state_ == SECOND_REQUEST) {
-        next_update_sec_ = rand_util::RandInt(15, 45) * 60;
+        next_update_sec_ = base::RandInt(15 * 60, 45 * 60);
       }
 
       // We need to request a new set of keys for MAC.
       if (re_key)
         HandleReKey();
 
       // New chunks to download.
       if (!chunk_urls.empty()) {
         for (size_t i = 0; i < chunk_urls.size(); ++i)
           chunk_request_urls_.push_back(chunk_urls[i]);
@@ skipping 75 matching lines @@
 
     default:
       return false;
   }
 
   return true;
 }
 
 void SafeBrowsingProtocolManager::Initialize() {
   // Don't want to hit the safe browsing servers on build/chrome bots.
-  if (env_util::HasEnvironmentVariable(env_vars::kHeadless))
+  if (base::SysInfo::HasEnvironmentVariable(env_vars::kHeadless))

[Mark Mentovai, 2008/09/29 22:20:05]

env_vars::kHeadless is a const wchar_t*, but HasEnvVar accepts a const char*. 
The same goes for the other env_vars constants.  I had to update GetEnvVar and
HasEnvVar to use a wchar_t* parameter, update the Windows and POSIX
implementations, and update the test.  These changes were all in
base/sys_info.*.  Sucky as it is, that's how our current strings picture looks. 
This was the least invasive fix, and we were already using wstrings for output
anyway.

     return;
 
   ScheduleNextUpdate(false /* no back off */);
 }
 
 void SafeBrowsingProtocolManager::ScheduleNextUpdate(bool back_off) {
   DCHECK(next_update_sec_ > 0);
 
   // Unschedule any current timer.
   update_timer_.Stop();
@@ skipping 168 matching lines @@
 void SafeBrowsingProtocolManager::HandleReKey() {
   client_key_.clear();
   wrapped_key_.clear();
   IssueKeyRequest();
 }
 
 void SafeBrowsingProtocolManager::HandleGetHashError() {
   int next = GetNextBackOffTime(&gethash_error_count_, &gethash_back_off_mult_);
   next_gethash_time_ = Time::Now() + TimeDelta::FromSeconds(next);
 }