more changes

chrome/browser/net/predictor.cc

 // Copyright (c) 2011 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/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <sstream>
@@ skipping 588 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Just finish up work if an incremental trim is in progress.
   if (urls_being_trimmed_.empty())
     LoadUrlsForTrimming();
   IncrementalTrimReferrers(true);  // Do everything now.
 }
 
 void Predictor::SerializeReferrers(ListValue* referral_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   referral_list->Clear();
-  referral_list->Append(new base::FundamentalValue(PREDICTOR_REFERRER_VERSION));
+  referral_list->Append(base::NumberValue::New(PREDICTOR_REFERRER_VERSION));
   for (Referrers::const_iterator it = referrers_.begin();
        it != referrers_.end(); ++it) {
     // Serialize the list of subresource names.
     Value* subresource_list(it->second.Serialize());
 
     // Create a list for each referer.
     ListValue* motivator(new ListValue);
-    motivator->Append(new StringValue(it->first.spec()));
+    motivator->Append(base::StringValue::New(it->first.spec()));
     motivator->Append(subresource_list);
 
     referral_list->Append(motivator);
   }
 }
 
 void Predictor::DeserializeReferrers(const ListValue& referral_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   int format_version = -1;
   if (referral_list.GetSize() > 0 &&
@@ skipping 135 matching lines @@
   // If we omit a port, it will default to 80 or 443 as appropriate.
   std::string colon_plus_port;
   if (url.has_port())
     colon_plus_port = ":" + url.port();
 
   return GURL(scheme + "://" + url.host() + colon_plus_port);
 }
 
 
 }  // namespace chrome_browser_net