more changes

chrome/browser/net/predictor_unittest.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 <time.h>
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 
@@ skipping 265 matching lines @@
     EXPECT_TRUE(motivation_list->GetString(0, &existing_spec));
     if (motivation == GURL(existing_spec))
       return motivation_list;
   }
   return NULL;
 }
 
 // Create a new empty serialization list.
 static ListValue* NewEmptySerializationList() {
   base::ListValue* list = new base::ListValue;
-  list->Append(
-      new base::FundamentalValue(Predictor::PREDICTOR_REFERRER_VERSION));
+  list->Append(base::NumberValue::New(Predictor::PREDICTOR_REFERRER_VERSION));
   return list;
 }
 
 // Add a motivating_url and a subresource_url to a serialized list, using
 // this given latency. This is a helper function for quickly building these
 // lists.
 static void AddToSerializedList(const GURL& motivation,
                                 const GURL& subresource,
                                 double use_rate,
                                 ListValue* referral_list ) {
   // Find the motivation if it is already used.
   ListValue* motivation_list = FindSerializationMotivation(motivation,
                                                            *referral_list);
   if (!motivation_list) {
     // This is the first mention of this motivation, so build a list.
     motivation_list = new ListValue;
-    motivation_list->Append(new StringValue(motivation.spec()));
+    motivation_list->Append(base::StringValue::New(motivation.spec()));
     // Provide empty subresource list.
     motivation_list->Append(new ListValue());
 
     // ...and make it part of the serialized referral_list.
     referral_list->Append(motivation_list);
   }
 
   ListValue* subresource_list(NULL);
   // 0 == url; 1 == subresource_list.
   EXPECT_TRUE(motivation_list->GetList(1, &subresource_list));
 
   // We won't bother to check for the subresource being there already.  Worst
   // case, during deserialization, the latency value we supply plus the
   // existing value(s) will be added to the referrer.
 
   subresource_list->Append(new base::StringValue(subresource.spec()));
-  subresource_list->Append(new base::FundamentalValue(use_rate));
+  subresource_list->Append(base::NumberValue::New(use_rate));
 }
 
 static const int kLatencyNotFound = -1;
 
 // For a given motivation, and subresource, find what latency is currently
 // listed.  This assume a well formed serialization, which has at most one such
 // entry for any pair of names.  If no such pair is found, then return false.
 // Data is written into use_rate arguments.
 static bool GetDataFromSerialization(const GURL& motivation,
                                      const GURL& subresource,
@@ skipping 286 matching lines @@
   EXPECT_EQ(2U, referral_list.GetSize());
 
   predictor->DiscardAllResults();
   predictor->SerializeReferrers(&referral_list);
   EXPECT_EQ(1U, referral_list.GetSize());
 
   predictor->Shutdown();
 }
 
 }  // namespace chrome_browser_net