| Index: chrome/browser/history/history_publisher_win.cc
|
| diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc
|
| index ec8525b990079feea1742428a73a337154e748e2..4aeb333721c4b2bed25b2aeae9788554f821014e 100644
|
| --- a/chrome/browser/history/history_publisher_win.cc
|
| +++ b/chrome/browser/history/history_publisher_win.cc
|
| @@ -119,7 +119,7 @@ void HistoryPublisher::PublishDataToIndexers(const PageData& page_data)
|
| }
|
|
|
| // Send data to registered indexers.
|
| - ScopedVariant time(var_time, VT_DATE);
|
| + base::win::ScopedVariant time(var_time, VT_DATE);
|
| ScopedBstr url(ASCIIToWide(page_data.url.spec()).c_str());
|
| ScopedBstr html(page_data.html);
|
| ScopedBstr title(page_data.title);
|
| @@ -127,7 +127,7 @@ void HistoryPublisher::PublishDataToIndexers(const PageData& page_data)
|
| ScopedBstr format(page_data.thumbnail_format ?
|
| ASCIIToWide(page_data.thumbnail_format).c_str() :
|
| NULL);
|
| - ScopedVariant psa(thumbnail_arr.m_psa);
|
| + base::win::ScopedVariant psa(thumbnail_arr.m_psa);
|
| for (size_t i = 0; i < indexers_.size(); ++i) {
|
| indexers_[i]->SendPageData(time, url, html, title, format, psa);
|
| }
|
| @@ -136,8 +136,10 @@ void HistoryPublisher::PublishDataToIndexers(const PageData& page_data)
|
| void HistoryPublisher::DeleteUserHistoryBetween(const base::Time& begin_time,
|
| const base::Time& end_time)
|
| const {
|
| - ScopedVariant var_begin_time(TimeToUTCVariantTime(begin_time), VT_DATE);
|
| - ScopedVariant var_end_time(TimeToUTCVariantTime(end_time), VT_DATE);
|
| + base::win::ScopedVariant var_begin_time(TimeToUTCVariantTime(begin_time),
|
| + VT_DATE);
|
| + base::win::ScopedVariant var_end_time(TimeToUTCVariantTime(end_time),
|
| + VT_DATE);
|
| for (size_t i = 0; i < indexers_.size(); ++i) {
|
| indexers_[i]->DeleteUserHistoryBetween(var_begin_time, var_end_time);
|
| }
|
|
|