Make history title inclusion safer (createTextNode changes)....

chrome/browser/dom_ui/history_ui.cc

 // Copyright (c) 2006-2008 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/history_ui.h"
 
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/time_format.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/time_format.h"
 #include "net/base/escape.h"
@@ skipping 87 matching lines @@
                         &ChromeURLDataManager::AddDataSource,
                         new FavIconSource(dom_ui_->get_profile())));
 
   // Get notifications when history is cleared.
   NotificationService* service = NotificationService::current();
   service->AddObserver(this, NotificationType::HISTORY_URLS_DELETED,
                        Source<Profile>(dom_ui_->get_profile()));
 }
 
 BrowsingHistoryHandler::~BrowsingHistoryHandler() {
+  cancelable_consumer_.CancelAllRequests();
+
   NotificationService* service = NotificationService::current();
   service->RemoveObserver(this, NotificationType::HISTORY_URLS_DELETED,
                           Source<Profile>(dom_ui_->get_profile()));
 
-  if (remover_)
+  if (remover_.get())
     remover_->RemoveObserver(this);
 }
 
 void BrowsingHistoryHandler::HandleGetHistory(const Value* value) {
   // Anything in-flight is invalid.
   cancelable_consumer_.CancelAllRequests();
 
   // Get arguments (if any).
   int day = 0;
   ExtractIntegerValue(value, &day);
@@ skipping 37 matching lines @@
   search_text_ = query;
   HistoryService* hs =
       dom_ui_->get_profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
       &cancelable_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
 
 void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
+  if (BrowsingDataRemover::is_removing()) {
+    dom_ui_->CallJavascriptFunction(L"deleteFailed");
+    return;
+  }
+  
   // Anything in-flight is invalid.
   cancelable_consumer_.CancelAllRequests();
 
   // Get time.
   Time time;
   bool success = Time::FromString(ExtractStringValue(value).c_str(), &time);
   DCHECK(success);
 
   Time begin_time = time.LocalMidnight();
   Time end_time = begin_time + TimeDelta::FromDays(1);
 
-  if (!remover_) {
-    remover_ = new BrowsingDataRemover(dom_ui_->get_profile(),
-                                       begin_time,
-                                       end_time);
-    remover_->AddObserver(this);
-  }
-
+  remover_.reset(new BrowsingDataRemover(dom_ui_->get_profile(),
+                                         begin_time,
+                                         end_time));
+  remover_->AddObserver(this);
   remover_->Remove(BrowsingDataRemover::REMOVE_HISTORY |
                    BrowsingDataRemover::REMOVE_COOKIES |
                    BrowsingDataRemover::REMOVE_CACHE);
 }
 
 void BrowsingHistoryHandler::OnBrowsingDataRemoverDone() {
   dom_ui_->CallJavascriptFunction(L"deleteComplete");
+  remover_->RemoveObserver(this);
+  remover_.release();
 }
 
 void BrowsingHistoryHandler::QueryComplete(
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
 
   ListValue results_value;
   Time midnight_today = Time::Now().LocalMidnight();
 
   for (size_t i = 0; i < results->size(); ++i) {
@@ skipping 23 matching lines @@
             date_str, base::TimeFormatFriendlyDate(page.visit_time()));
       }
       page_value->SetString(L"dateRelativeDay", date_str);
       page_value->SetString(L"dateTimeOfDay",
           base::TimeFormatTimeOfDay(page.visit_time()));
     } else {
       page_value->SetString(L"dateShort",
           base::TimeFormatShortDate(page.visit_time()));
       page_value->SetString(L"snippet", page.snippet().text());
     }
-
+    page_value->SetBoolean(L"starred", 
+        dom_ui_->get_profile()->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
   }
 
   StringValue temp(search_text_);
   dom_ui_->CallJavascriptFunction(L"historyResult", temp, results_value);
 }
 
 void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value,
     int* month, std::wstring* query) {
   *month = 0;
@@ skipping 102 matching lines @@
 GURL HistoryUI::GetBaseURL() {
   std::string url = DOMUIContents::GetScheme();
   url += "://";
   url += kHistoryHost;
   return GURL(url);
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(
   const std::wstring& text) {
-    return GURL(GetBaseURL().spec() + "/?q=" +
+    return GURL(GetBaseURL().spec() + "#q=" +
       EscapeQueryParamValue(WideToUTF8(text)));
 }