Change 4 funcs to JumpList member funcs, retire wstring for jumplist*

chrome/browser/win/jumplist_updater.cc

 // Copyright 2014 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/win/jumplist_updater.h"
 
 #include <windows.h>
 #include <objbase.h>
 #include <propkey.h>
 #include <shobjidl.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/content_switches.h"
 
 namespace {
 
 // Creates an IShellLink object.
 // An IShellLink object is almost the same as an application shortcut, and it
 // requires three items: the absolute path to an application, an argument
 // string, and a title string.
 bool AddShellLink(base::win::ScopedComPtr<IObjectCollection> collection,
-                  const std::wstring& application_path,
+                  const base::string16& application_path,
                   scoped_refptr<ShellLinkItem> item) {
   // Create an IShellLink object.
   base::win::ScopedComPtr<IShellLink> link;
   HRESULT result = link.CreateInstance(CLSID_ShellLink, NULL,
                                        CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
   // Set the application path.
   // We should exit this function when this call fails because it doesn't make
   // any sense to add a shortcut that we cannot execute.
   result = link->SetPath(application_path.c_str());
   if (FAILED(result))
     return false;
 
   // Attach the command-line switches of this process before the given
   // arguments and set it as the arguments of this IShellLink object.
   // We also exit this function when this call fails because it isn't useful to
   // add a shortcut that cannot open the given page.
-  std::wstring arguments(item->GetArguments());
+  base::string16 arguments(item->GetArguments());
   if (!arguments.empty()) {
     result = link->SetArguments(arguments.c_str());
     if (FAILED(result))
       return false;
   }
 
   // Attach the given icon path to this IShellLink object.
   // Since an icon is an optional item for an IShellLink object, so we don't
   // have to exit even when it fails.
   if (!item->icon_path().empty())
@@ skipping 24 matching lines @@
 
 
 // ShellLinkItem
 
 ShellLinkItem::ShellLinkItem()
     : command_line_(base::CommandLine::NO_PROGRAM), icon_index_(0) {
 }
 
 ShellLinkItem::~ShellLinkItem() {}
 
-std::wstring ShellLinkItem::GetArguments() const {
+base::string16 ShellLinkItem::GetArguments() const {
   return command_line_.GetArgumentsString();
 }
 
 base::CommandLine* ShellLinkItem::GetCommandLine() {
   return &command_line_;
 }
 
 
 // JumpListUpdater
 
-JumpListUpdater::JumpListUpdater(const std::wstring& app_user_model_id)
-    : app_user_model_id_(app_user_model_id),
-      user_max_items_(0) {
-}
+JumpListUpdater::JumpListUpdater(const base::string16& app_user_model_id)
+    : app_user_model_id_(app_user_model_id), user_max_items_(0) {}
 
 JumpListUpdater::~JumpListUpdater() {
 }
 
 // static
 bool JumpListUpdater::IsEnabled() {
   // Do not create custom JumpLists in tests. See http://crbug.com/389375.
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kTestType);
 }
@@ skipping 79 matching lines @@
   // interface to retrieve each item in the list. So, we retrieve the
   // IObjectArray interface from the EnumerableObjectCollection object.
   base::win::ScopedComPtr<IObjectArray> object_array;
   result = collection.CopyTo(object_array.Receive());
   if (FAILED(result))
     return false;
 
   return SUCCEEDED(destination_list_->AddUserTasks(object_array.Get()));
 }
 
-bool JumpListUpdater::AddCustomCategory(const std::wstring& category_name,
+bool JumpListUpdater::AddCustomCategory(const base::string16& category_name,
                                         const ShellLinkItemList& link_items,
                                         size_t max_items) {
   // TODO(chengx): Remove the UMA histogram after fixing http://crbug.com/40407.
   SCOPED_UMA_HISTOGRAM_TIMER("WinJumplistUpdater.AddCustomCategoryDuration");
 
   if (!destination_list_.Get())
     return false;
 
   // Retrieve the absolute path to "chrome.exe".
   base::FilePath application_path;
@@ skipping 29 matching lines @@
   // It seems the ICustomDestinationList::AppendCategory() function just
   // replaces all items in the given category with the ones in the new list.
   base::win::ScopedComPtr<IObjectArray> object_array;
   result = collection.CopyTo(object_array.Receive());
   if (FAILED(result))
     return false;
 
   return SUCCEEDED(destination_list_->AppendCategory(category_name.c_str(),
                                                      object_array.Get()));
 }