Add explicit base to FilePath.

content/ppapi_plugin/broker_process_dispatcher.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 "content/ppapi_plugin/broker_process_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/child_process.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/private/ppp_flash_browser_operations.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 namespace content {
 namespace {
 
 // How long we wait before releasing the broker process.
 const int kBrokerReleaseTimeSeconds = 30;
 
-std::string ConvertPluginDataPath(const FilePath& plugin_data_path) {
+std::string ConvertPluginDataPath(const base::FilePath& plugin_data_path) {
   // The string is always 8-bit, convert on Windows.
 #if defined(OS_WIN)
   return WideToUTF8(plugin_data_path.value());
 #else
   return plugin_data_path.value();
 #endif
 }
 
 struct GetPermissionSettingsContext {
   GetPermissionSettingsContext(
@@ skipping 97 matching lines @@
     uint32 request_id,
     bool success,
     PP_Flash_BrowserOperations_Permission default_permission,
     const ppapi::FlashSiteSettings& sites) {
   Send(new PpapiHostMsg_GetPermissionSettingsResult(
       request_id, success, default_permission, sites));
 }
 
 void BrokerProcessDispatcher::OnGetSitesWithData(
     uint32 request_id,
-    const FilePath& plugin_data_path) {
+    const base::FilePath& plugin_data_path) {
   std::vector<std::string> sites;
   GetSitesWithData(plugin_data_path, &sites);
   Send(new PpapiHostMsg_GetSitesWithDataResult(request_id, sites));
 }
 
 void BrokerProcessDispatcher::OnClearSiteData(
     uint32 request_id,
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     const std::string& site,
     uint64 flags,
     uint64 max_age) {
   Send(new PpapiHostMsg_ClearSiteDataResult(
       request_id, ClearSiteData(plugin_data_path, site, flags, max_age)));
 }
 
 void BrokerProcessDispatcher::OnDeauthorizeContentLicenses(
     uint32 request_id,
-    const FilePath& plugin_data_path) {
+    const base::FilePath& plugin_data_path) {
   Send(new PpapiHostMsg_DeauthorizeContentLicensesResult(
       request_id, DeauthorizeContentLicenses(plugin_data_path)));
 }
 
 void BrokerProcessDispatcher::OnGetPermissionSettings(
     uint32 request_id,
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     PP_Flash_BrowserOperations_SettingType setting_type) {
   if (flash_browser_operations_1_3_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     // The GetPermissionSettingsContext object will be deleted in
     // GetPermissionSettingsCallback().
     flash_browser_operations_1_3_->GetPermissionSettings(
         data_str.c_str(), setting_type, &GetPermissionSettingsCallback,
         new GetPermissionSettingsContext(AsWeakPtr(), request_id));
     return;
   }
 
   if (flash_browser_operations_1_2_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     // The GetPermissionSettingsContext object will be deleted in
     // GetPermissionSettingsCallback().
     flash_browser_operations_1_2_->GetPermissionSettings(
         data_str.c_str(), setting_type, &GetPermissionSettingsCallback,
         new GetPermissionSettingsContext(AsWeakPtr(), request_id));
     return;
   }
 
   OnGetPermissionSettingsCompleted(
       request_id, false, PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT,
       ppapi::FlashSiteSettings());
   return;
 }
 
 void BrokerProcessDispatcher::OnSetDefaultPermission(
     uint32 request_id,
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     PP_Flash_BrowserOperations_SettingType setting_type,
     PP_Flash_BrowserOperations_Permission permission,
     bool clear_site_specific) {
   Send(new PpapiHostMsg_SetDefaultPermissionResult(
       request_id,
       SetDefaultPermission(plugin_data_path, setting_type, permission,
                            clear_site_specific)));
 }
 
 void BrokerProcessDispatcher::OnSetSitePermission(
     uint32 request_id,
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     PP_Flash_BrowserOperations_SettingType setting_type,
     const ppapi::FlashSiteSettings& sites) {
   Send(new PpapiHostMsg_SetSitePermissionResult(
       request_id, SetSitePermission(plugin_data_path, setting_type, sites)));
 }
 
 void BrokerProcessDispatcher::GetSitesWithData(
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     std::vector<std::string>* site_vector) {
   std::string data_str = ConvertPluginDataPath(plugin_data_path);
   if (flash_browser_operations_1_3_) {
     char** sites = NULL;
     flash_browser_operations_1_3_->GetSitesWithData(data_str.c_str(), &sites);
     if (!sites)
       return;
 
     for (size_t i = 0; sites[i]; ++i)
       site_vector->push_back(sites[i]);
 
     flash_browser_operations_1_3_->FreeSiteList(sites);
   }
 }
 
-bool BrokerProcessDispatcher::ClearSiteData(const FilePath& plugin_data_path,
-                                            const std::string& site,
-                                            uint64 flags,
-                                            uint64 max_age) {
+bool BrokerProcessDispatcher::ClearSiteData(
+    const base::FilePath& plugin_data_path,
+    const std::string& site,
+    uint64 flags,
+    uint64 max_age) {
   std::string data_str = ConvertPluginDataPath(plugin_data_path);
   if (flash_browser_operations_1_3_) {
     flash_browser_operations_1_3_->ClearSiteData(
         data_str.c_str(), site.empty() ? NULL : site.c_str(), flags, max_age);
     return true;
   }
 
   // TODO(viettrungluu): Remove this (and the 1.0 interface) sometime after M21
   // goes to Stable.
   if (flash_browser_operations_1_2_) {
     flash_browser_operations_1_2_->ClearSiteData(
         data_str.c_str(), site.empty() ? NULL : site.c_str(), flags, max_age);
     return true;
   }
 
   if (flash_browser_operations_1_0_) {
     flash_browser_operations_1_0_->ClearSiteData(
         data_str.c_str(), site.empty() ? NULL : site.c_str(), flags, max_age);
     return true;
   }
 
   return false;
 }
 
 bool BrokerProcessDispatcher::DeauthorizeContentLicenses(
-    const FilePath& plugin_data_path) {
+    const base::FilePath& plugin_data_path) {
   if (flash_browser_operations_1_3_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     return PP_ToBool(flash_browser_operations_1_3_->DeauthorizeContentLicenses(
         data_str.c_str()));
   }
 
   if (flash_browser_operations_1_2_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     return PP_ToBool(flash_browser_operations_1_2_->DeauthorizeContentLicenses(
         data_str.c_str()));
   }
 
   return false;
 }
 
 bool BrokerProcessDispatcher::SetDefaultPermission(
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     PP_Flash_BrowserOperations_SettingType setting_type,
     PP_Flash_BrowserOperations_Permission permission,
     bool clear_site_specific) {
   if (flash_browser_operations_1_3_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     return PP_ToBool(flash_browser_operations_1_3_->SetDefaultPermission(
         data_str.c_str(), setting_type, permission,
         PP_FromBool(clear_site_specific)));
   }
 
   if (flash_browser_operations_1_2_) {
     std::string data_str = ConvertPluginDataPath(plugin_data_path);
     return PP_ToBool(flash_browser_operations_1_2_->SetDefaultPermission(
         data_str.c_str(), setting_type, permission,
         PP_FromBool(clear_site_specific)));
   }
 
   return false;
 }
 
 bool BrokerProcessDispatcher::SetSitePermission(
-    const FilePath& plugin_data_path,
+    const base::FilePath& plugin_data_path,
     PP_Flash_BrowserOperations_SettingType setting_type,
     const ppapi::FlashSiteSettings& sites) {
   if (sites.empty())
     return true;
 
   std::string data_str = ConvertPluginDataPath(plugin_data_path);
   scoped_array<PP_Flash_BrowserOperations_SiteSetting> site_array(
       new PP_Flash_BrowserOperations_SiteSetting[sites.size()]);
 
   for (size_t i = 0; i < sites.size(); ++i) {
@@ skipping 12 matching lines @@
     PP_Bool result = flash_browser_operations_1_2_->SetSitePermission(
         data_str.c_str(), setting_type, sites.size(), site_array.get());
 
     return PP_ToBool(result);
   }
 
   return false;
 }
 
 }  // namespace content