webkit: Merge blob and fileapi into one build target 'storage'

webkit/fileapi/file_system_url_request_job.h

 // 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.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 class FilePath;
 
 namespace webkit_blob {
 class FileStreamReader;
 }
 
 namespace fileapi {
 class FileSystemContext;
 
 // A request job that handles reading filesystem: URLs
-class FILEAPI_EXPORT_PRIVATE FileSystemURLRequestJob
+class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemURLRequestJob
     : public net::URLRequestJob {
  public:
   FileSystemURLRequestJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       FileSystemContext* file_system_context);
 
   // URLRequestJob methods:
   virtual void Start() OVERRIDE;
   virtual void Kill() OVERRIDE;
@@ skipping 31 matching lines @@
   scoped_ptr<net::HttpResponseInfo> response_info_;
   int64 remaining_bytes_;
   net::HttpByteRange byte_range_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemURLRequestJob);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_