more changes

chrome/browser/history/top_sites.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/history/top_sites.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 346 matching lines @@
 }
 
 bool TopSites::HasBlacklistedItems() const {
   return !blacklist_->empty();
 }
 
 void TopSites::AddBlacklistedURL(const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RemovePinnedURL(url);
-  Value* dummy = Value::CreateNullValue();
+  Value* dummy = base::NullValue();
   {
     DictionaryPrefUpdate update(profile_->GetPrefs(),
                                 prefs::kNTPMostVisitedURLsBlacklist);
     DictionaryValue* blacklist = update.Get();
     blacklist->SetWithoutPathExpansion(GetURLHash(url), dummy);
   }
 
   ResetThreadSafeCache();
   NotifyTopSitesChanged();
 }
@@ skipping 30 matching lines @@
 void TopSites::AddPinnedURL(const GURL& url, size_t pinned_index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GURL old;
   if (GetPinnedURLAtIndex(pinned_index, &old))
     RemovePinnedURL(old);
 
   if (IsURLPinned(url))
     RemovePinnedURL(url);
 
-  Value* index = Value::CreateIntegerValue(pinned_index);
+  Value* index = base::NumberValue::New(static_cast<int>(pinned_index));
 
   {
     DictionaryPrefUpdate update(profile_->GetPrefs(),
                                 prefs::kNTPMostVisitedPinnedURLs);
     DictionaryValue* pinned_urls = update.Get();
     pinned_urls->SetWithoutPathExpansion(GetURLString(url), index);
   }
 
   ResetThreadSafeCache();
   NotifyTopSitesChanged();
@@ skipping 577 matching lines @@
   SetTopSites(pages);
 
   // Used only in testing.
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_UPDATED,
       Source<TopSites>(this),
       Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history