Move storage-related files from webkit/ to new top-level directory storage/

content/renderer/pepper/resource_converter.cc

 // Copyright 2013 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/renderer/pepper/resource_converter.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_file_system_host.h"
 #include "content/renderer/pepper/pepper_media_stream_audio_track_host.h"
 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/resource_var.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
 #include "third_party/WebKit/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/web/WebDOMFileSystem.h"
 #include "third_party/WebKit/public/web/WebDOMMediaStreamTrack.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 using ppapi::ResourceVar;
 
 namespace content {
 namespace {
 
 void FlushComplete(
     const base::Callback<void(bool)>& callback,
     const std::vector<scoped_refptr<content::HostResourceVar> >& browser_vars,
     const std::vector<int>& pending_host_ids) {
@@ skipping 14 matching lines @@
     case blink::WebFileSystem::TypeIsolated:
       return PP_FILESYSTEMTYPE_ISOLATED;
     case blink::WebFileSystem::TypeExternal:
       return PP_FILESYSTEMTYPE_EXTERNAL;
     default:
       NOTREACHED();
       return PP_FILESYSTEMTYPE_LOCALTEMPORARY;
   }
 }
 
-// Converts a fileapi::FileSystemType to a blink::WebFileSystemType.
+// Converts a storage::FileSystemType to a blink::WebFileSystemType.
 // Returns true on success, false if |type| does not correspond to a
 // WebFileSystemType.
 bool FileApiFileSystemTypeToWebFileSystemType(
-    fileapi::FileSystemType type,
+    storage::FileSystemType type,
     blink::WebFileSystemType* result_type) {
   switch (type) {
-    case fileapi::kFileSystemTypeTemporary:
+    case storage::kFileSystemTypeTemporary:
       *result_type = blink::WebFileSystemTypeTemporary;
       return true;
-    case fileapi::kFileSystemTypePersistent:
+    case storage::kFileSystemTypePersistent:
       *result_type = blink::WebFileSystemTypePersistent;
       return true;
-    case fileapi::kFileSystemTypeIsolated:
+    case storage::kFileSystemTypeIsolated:
       *result_type = blink::WebFileSystemTypeIsolated;
       return true;
-    case fileapi::kFileSystemTypeExternal:
+    case storage::kFileSystemTypeExternal:
       *result_type = blink::WebFileSystemTypeExternal;
       return true;
     default:
       return false;
   }
 }
 
 // Given a V8 value containing a DOMFileSystem, creates a resource host and
 // returns the resource information for serialization.
 // On error, false.
@@ skipping 32 matching lines @@
                                                      file_system_type));
   return true;
 }
 
 bool ResourceHostToDOMFileSystem(
     content::PepperFileSystemHost* file_system_host,
     v8::Handle<v8::Context> context,
     v8::Handle<v8::Value>* dom_file_system) {
   GURL root_url = file_system_host->GetRootUrl();
   GURL origin;
-  fileapi::FileSystemType type;
+  storage::FileSystemType type;
   base::FilePath virtual_path;
-  fileapi::ParseFileSystemSchemeURL(root_url, &origin, &type, &virtual_path);
+  storage::ParseFileSystemSchemeURL(root_url, &origin, &type, &virtual_path);
 
-  std::string name = fileapi::GetFileSystemName(origin, type);
+  std::string name = storage::GetFileSystemName(origin, type);
   blink::WebFileSystemType blink_type;
   if (!FileApiFileSystemTypeToWebFileSystemType(type, &blink_type))
     return false;
   blink::WebLocalFrame* frame = blink::WebLocalFrame::frameForContext(context);
   blink::WebDOMFileSystem web_dom_file_system = blink::WebDOMFileSystem::create(
       frame,
       blink_type,
       blink::WebString::fromUTF8(name),
       root_url,
       blink::WebDOMFileSystem::SerializableTypeSerializable);
@@ skipping 200 matching lines @@
     const IPC::Message& create_message,
     const IPC::Message& browser_host_create_message) {
   scoped_refptr<HostResourceVar> result =
       CreateResourceVar(pending_renderer_id, create_message);
   browser_host_create_messages_.push_back(browser_host_create_message);
   browser_vars_.push_back(result);
   return result;
 }
 
 }  // namespace content