Speculative fix for crash in DOMUIThumbnailSource.

chrome/browser/dom_ui/most_visited_handler.cc

 // Copyright (c) 2010 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 <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/pref_names.h"
+#include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // The number of most visited pages we show.
 const size_t kMostVisitedPages = 8;
 
 // The number of days of history we consider for most visited entries.
 const int kMostVisitedScope = 90;
 
-// Adds the fields in the page to the dictionary.
-void SetMostVisistedPage(DictionaryValue* dict,
-                         const MostVisitedHandler::MostVisitedPage& page) {
-  NewTabUI::SetURLTitleAndDirection(dict, WideToUTF16(page.title), page.url);
-  if (!page.favicon_url.is_empty())
-    dict->SetString(L"faviconUrl", page.favicon_url.spec());
-  if (!page.thumbnail_url.is_empty())
-    dict->SetString(L"thumbnailUrl", page.thumbnail_url.spec());
-}
+}  // namespace
 
-}  // namespace
+// This struct is used when getting the pre-populated pages in case the user
+// hasn't filled up his most visited pages.
+struct MostVisitedHandler::MostVisitedPage {
+  std::wstring title;
+  GURL url;
+  GURL thumbnail_url;
+  GURL favicon_url;
+};
 
 MostVisitedHandler::MostVisitedHandler()
     : url_blacklist_(NULL),
       pinned_urls_(NULL),
       got_first_most_visited_request_(false) {
 }
 
 DOMMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
   url_blacklist_ = dom_ui->GetProfile()->GetPrefs()->
       GetMutableDictionary(prefs::kNTPMostVisitedURLsBlacklist);
@@ skipping 465 matching lines @@
   // If we found no pages we treat this as the first run.
   bool first_run = NewTabUI::NewTabHTMLSource::first_run() &&
       pages_value_->GetSize() ==
           MostVisitedHandler::GetPrePopulatedPages().size();
   // but first_run should only be true once.
   NewTabUI::NewTabHTMLSource::set_first_run(false);
   return first_run;
 }
 
 // static
+void MostVisitedHandler::SetMostVisistedPage(
+    DictionaryValue* dict,
+    const MostVisitedHandler::MostVisitedPage& page) {
+  NewTabUI::SetURLTitleAndDirection(dict, WideToUTF16(page.title), page.url);
+  if (!page.favicon_url.is_empty())
+    dict->SetString(L"faviconUrl", page.favicon_url.spec());
+  if (!page.thumbnail_url.is_empty())
+    dict->SetString(L"thumbnailUrl", page.thumbnail_url.spec());
+}
+
+
+// static
 const std::vector<MostVisitedHandler::MostVisitedPage>&
     MostVisitedHandler::GetPrePopulatedPages() {
   // TODO(arv): This needs to get the data from some configurable place.
   // http://crbug.com/17630
   static std::vector<MostVisitedPage> pages;
   if (pages.empty()) {
     MostVisitedPage welcome_page = {
         l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
         GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
         GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL"),
@@ skipping 65 matching lines @@
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs);
 }
 
 bool MostVisitedHandler::HasApps() const {
   ExtensionsService* service = dom_ui_->GetProfile()->GetExtensionsService();
   if (!service)
     return false;
 
   return service->HasApps();
 }