Speculative fix for crash in DOMUIThumbnailSource.

chrome/browser/dom_ui/most_visited_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOM_UI_MOST_VISITED_HANDLER_H_
 #define CHROME_BROWSER_DOM_UI_MOST_VISITED_HANDLER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "googleurl/src/gurl.h"
 
 class DictionaryValue;
+class GURL;
 class ListValue;
 class PageUsageData;
 class PrefService;
 class Value;
 
 // The handler for Javascript messages related to the "most visited" view.
 class MostVisitedHandler : public DOMMessageHandler,
                            public NotificationObserver {
  public:
-  // This struct is used when getting the pre-populated pages in case the user
-  // hasn't filled up his most visited pages.
-  struct MostVisitedPage {
-    std::wstring title;
-    GURL url;
-    GURL thumbnail_url;
-    GURL favicon_url;
-  };
 
   MostVisitedHandler();
   virtual ~MostVisitedHandler() { }
 
   // DOMMessageHandler override and implementation.
   virtual DOMMessageHandler* Attach(DOMUI* dom_ui);
   virtual void RegisterMessages();
 
   // Callback for the "getMostVisited" message.
   void HandleGetMostVisited(const Value* value);
@@ skipping 21 matching lines @@
   const std::vector<GURL>& most_visited_urls() const {
     return most_visited_urls_;
   }
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns Chrome Store URL with locale applied.
   static GURL GetChromeStoreURLWithLocale();
 
  private:
+  struct MostVisitedPage;
+
   // Send a request to the HistoryService to get the most visited pages.
   void StartQueryForMostVisited();
 
   // Callback from the history system when the most visited list is available.
   void OnSegmentUsageAvailable(CancelableRequestProvider::Handle handle,
                                std::vector<PageUsageData*>* data);
 
   // Sets pages_value_ from a vector of URLs.
   void SetPagesValue(std::vector<PageUsageData*>* data);
 
@@ skipping 16 matching lines @@
 
   void AddPinnedURL(const MostVisitedPage& page, int index);
   void RemovePinnedURL(const GURL& url);
 
   // Sends pages_value_ to the javascript side to and resets page_value_.
   void SendPagesValue();
 
   // Returns true if we should treat this as the first run of the new tab page.
   bool IsFirstRun();
 
+  // Adds the fields in the page to the dictionary.
+  static void SetMostVisistedPage(
+      DictionaryValue* dict,
+      const MostVisitedHandler::MostVisitedPage& page);
+
   static const std::vector<MostVisitedPage>& GetPrePopulatedPages();
 
   static MostVisitedPage GetChromeStorePage();
 
   // Whether we have any apps installed.
   bool HasApps() const;
 
   NotificationRegistrar registrar_;
 
   // Our consumer for the history service.
@@ skipping 20 matching lines @@
   // we get the first getMostVisited() call.
   bool got_first_most_visited_request_;
 
   // Keep the results of the db query here.
   scoped_ptr<ListValue> pages_value_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler);
 };
 
 #endif  // CHROME_BROWSER_DOM_UI_MOST_VISITED_HANDLER_H_