| Index: content/renderer/pepper/pepper_file_system_host.cc
|
| diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc
|
| index 042c84f97bb6d5a770bd410758304f0b76fac339..ed70040eb3594ead0911d7e92c7a252927e35a59 100644
|
| --- a/content/renderer/pepper/pepper_file_system_host.cc
|
| +++ b/content/renderer/pepper/pepper_file_system_host.cc
|
| @@ -15,6 +15,7 @@
|
| #include "ppapi/host/dispatch_host_message.h"
|
| #include "ppapi/host/ppapi_host.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| +#include "ppapi/shared_impl/file_system_util.h"
|
| #include "ppapi/shared_impl/file_type_conversion.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| @@ -23,23 +24,6 @@
|
|
|
| namespace content {
|
|
|
| -namespace {
|
| -
|
| -// TODO(nhiroki): Move this function somewhere else to be shared.
|
| -std::string IsolatedFileSystemTypeToRootName(
|
| - PP_IsolatedFileSystemType_Private type) {
|
| - switch (type) {
|
| - case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
|
| - break;
|
| - case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
|
| - return "crxfs";
|
| - }
|
| - NOTREACHED() << type;
|
| - return std::string();
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| PepperFileSystemHost::PepperFileSystemHost(RendererPpapiHost* host,
|
| PP_Instance instance,
|
| PP_Resource resource,
|
| @@ -165,7 +149,7 @@ int32_t PepperFileSystemHost::OnHostMsgInitIsolatedFileSystem(
|
| return PP_ERROR_FAILED;
|
|
|
| const GURL& url = view->GetWebView()->mainFrame()->document().url();
|
| - const std::string root_name = IsolatedFileSystemTypeToRootName(type);
|
| + const std::string root_name = ppapi::IsolatedFileSystemTypeToRootName(type);
|
| if (root_name.empty())
|
| return PP_ERROR_BADARGUMENT;
|
| root_url_ = GURL(fileapi::GetIsolatedFileSystemRootURIString(
|
|
|