Many changes to DictionaryValues:...

chrome/browser/dom_ui/most_visited_handler.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/dom_ui/most_visited_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/md5.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 107 matching lines @@
     StartQueryForMostVisited();
   }
 }
 
 void MostVisitedHandler::StartQueryForMostVisited() {
   const int page_count = kMostVisitedPages;
   // Let's query for the number of items we want plus the blacklist size as
   // we'll be filtering-out the returned list with the blacklist URLs.
   // We do not subtract the number of pinned URLs we have because the
   // HistoryService does not know about those.
-  const int result_count = page_count + url_blacklist_->GetSize();
+  const int result_count = page_count + url_blacklist_->size();
   HistoryService* hs =
       dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   // |hs| may be null during unit tests.
   if (hs) {
     hs->QuerySegmentUsageSince(
         &cancelable_consumer_,
         base::Time::Now() - base::TimeDelta::FromDays(kMostVisitedScope),
         result_count,
         NewCallback(this, &MostVisitedHandler::OnSegmentUsageAvailable));
   }
@@ skipping 83 matching lines @@
 void MostVisitedHandler::AddPinnedURL(const MostVisitedPage& page, int index) {
   // Remove any pinned URL at the given index.
   MostVisitedPage old_page;
   if (GetPinnedURLAtIndex(index, &old_page)) {
     RemovePinnedURL(old_page.url);
   }
 
   DictionaryValue* new_value = new DictionaryValue();
   SetMostVisistedPage(new_value, page);
 
-  bool r = new_value->SetInteger(L"index", index);
-  DCHECK(r) << "Failed to set the index for a pinned URL from the NTP Most "
-            << "Visited.";
-
-  r = pinned_urls_->Set(GetDictionaryKeyForURL(page.url.spec()), new_value);
-  DCHECK(r) << "Failed to add pinned URL from the NTP Most Visited.";
+  new_value->SetInteger(L"index", index);
+  pinned_urls_->Set(GetDictionaryKeyForURL(page.url.spec()), new_value);
 
   // TODO(arv): Notify observers?
 
   // Don't call HandleGetMostVisited. Let the client call this as needed.
 }
 
 void MostVisitedHandler::HandleRemovePinnedURL(const Value* value) {
   if (!value->IsType(Value::TYPE_LIST)) {
     NOTREACHED();
     return;
@@ skipping 20 matching lines @@
 
 const bool MostVisitedHandler::GetPinnedURLAtIndex(const int index,
     MostVisitedPage* page) {
   // This iterates over all the pinned URLs. It might seem like it is worth
   // having a map from the index to the item but the number of items is limited
   // to the number of items the most visited section is showing on the NTP so
   // this will be fast enough for now.
   for (DictionaryValue::key_iterator it = pinned_urls_->begin_keys();
       it != pinned_urls_->end_keys(); ++it) {
     Value* value;
-    if (pinned_urls_->Get(*it, &value)) {
+    if (pinned_urls_->GetWithoutPathExpansion(*it, &value)) {
       if (!value->IsType(DictionaryValue::TYPE_DICTIONARY)) {
         NOTREACHED();
         return false;
       }
 
       int dict_index;
       DictionaryValue* dict = static_cast<DictionaryValue*>(value);
       if (dict->GetInteger(L"index", &dict_index) && dict_index == index) {
         // The favicon and thumbnail URLs may be empty.
         std::string tmp_string;
@@ skipping 152 matching lines @@
 std::wstring MostVisitedHandler::GetDictionaryKeyForURL(
     const std::string& url) {
   return ASCIIToWide(MD5String(url));
 }
 
 // static
 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist);
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs);
 }