Revert 184352

chrome/browser/jumplist_win.cc

 // Copyright (c) 2012 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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 256 matching lines @@
                        const std::wstring& application,
                        const std::wstring& switches,
                        const ShellLinkItemList& data,
                        int max_slots) {
   // Exit this function when the given vector does not contain any items
   // because an ICustomDestinationList::AppendCategory() call fails in this
   // case.
   if (data.empty() || !max_slots)
     return S_OK;
 
-  std::wstring category =
-      base::UTF16ToWide(l10n_util::GetStringUTF16(category_id));
+  std::wstring category = UTF16ToWide(l10n_util::GetStringUTF16(category_id));
 
   // Create an EnumerableObjectCollection object.
   // We once add the given items to this collection object and add this
   // collection to the JumpList.
   base::win::ScopedComPtr<IObjectCollection> collection;
   HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
                                              NULL, CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
@@ skipping 35 matching lines @@
                                              NULL, CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return result;
 
   // Create an IShellLink object which launches Chrome, and add it to the
   // collection. We use our application icon as the icon for this item.
   // We remove '&' characters from this string so we can share it with our
   // system menu.
   scoped_refptr<ShellLinkItem> chrome(new ShellLinkItem);
   std::wstring chrome_title =
-      base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_WINDOW));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_WINDOW));
   ReplaceSubstringsAfterOffset(&chrome_title, 0, L"&", L"");
   chrome->SetTitle(chrome_title);
   chrome->SetIcon(chrome_path, 0, false);
   AddShellLink(collection, chrome_path, chrome_switches, chrome);
 
   // Create an IShellLink object which launches Chrome in incognito mode, and
   // add it to the collection. We use our application icon as the icon for
   // this item.
   scoped_refptr<ShellLinkItem> incognito(new ShellLinkItem);
   incognito->SetArguments(
-      base::ASCIIToWide(std::string("--") + switches::kIncognito));
+      ASCIIToWide(std::string("--") + switches::kIncognito));
   std::wstring incognito_title =
-      base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_INCOGNITO_WINDOW));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_INCOGNITO_WINDOW));
   ReplaceSubstringsAfterOffset(&incognito_title, 0, L"&", L"");
   incognito->SetTitle(incognito_title);
   incognito->SetIcon(chrome_path, 0, false);
   AddShellLink(collection, chrome_path, chrome_switches, incognito);
 
   // We can now add the new list to the JumpList.
   // ICustomDestinationList::AddUserTasks() also uses the IObjectArray
   // interface to retrieve each item in the list. So, we retrieve the
   // IObjectArray interface from the EnumerableObjectCollection object.
   base::win::ScopedComPtr<IObjectArray> object_array;
@@ skipping 208 matching lines @@
   // If we have a pending favicon request, cancel it here (it is out of date).
   CancelPendingUpdate();
 
   {
     base::AutoLock auto_lock(list_lock_);
     most_visited_pages_.clear();
     for (size_t i = 0; i < data.size(); i++) {
       const history::MostVisitedURL& url = data[i];
       scoped_refptr<ShellLinkItem> link(new ShellLinkItem);
       std::string url_string = url.url.spec();
-      link->SetArguments(base::UTF8ToWide(url_string));
+      link->SetArguments(UTF8ToWide(url_string));
       link->SetTitle(!url.title.empty()? url.title : link->arguments());
       most_visited_pages_.push_back(link);
       icon_urls_.push_back(make_pair(url_string, link));
     }
   }
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavicon();
 }
 
@@ skipping 48 matching lines @@
                       size_t max_items) {
   // This code adds the URL and the title strings of the given tab to the
   // specified list.
   if (list->size() >= max_items)
     return false;
 
   scoped_refptr<ShellLinkItem> link(new ShellLinkItem);
   const TabNavigation& current_navigation =
       tab->navigations.at(tab->current_navigation_index);
   std::string url = current_navigation.virtual_url().spec();
-  link->SetArguments(base::UTF8ToWide(url));
+  link->SetArguments(UTF8ToWide(url));
   link->SetTitle(current_navigation.title());
   list->push_back(link);
   icon_urls_.push_back(make_pair(url, link));
   return true;
 }
 
 void JumpList::AddWindow(const TabRestoreService::Window* window,
                          ShellLinkItemList* list,
                          size_t max_items) {
   // This code enumerates al the tabs in the given window object and add their
@@ skipping 96 matching lines @@
 }
 
 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
   for (ShellLinkItemList::const_iterator item = item_list.begin();
       item != item_list.end(); ++item) {
     base::FilePath icon_path;
     if (CreateIconFile((*item)->data(), icon_dir_, &icon_path))
       (*item)->SetIcon(icon_path.value(), 0, true);
   }
 }