Fix webkit_storage exports definitions

webkit/browser/appcache/appcache_response.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_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
 #define WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_info.h"
+#include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
-#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class IOBuffer;
 }
 
 namespace appcache {
 
 class AppCacheService;
 
 static const int kUnkownResponseDataSize = -1;
 
 // Response info for a particular response id. Instances are tracked in
 // the working set.
-class WEBKIT_STORAGE_EXPORT AppCacheResponseInfo
+class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseInfo
     : public base::RefCounted<AppCacheResponseInfo> {
  public:
   // AppCacheResponseInfo takes ownership of the http_info.
   AppCacheResponseInfo(AppCacheService* service, const GURL& manifest_url,
                        int64 response_id, net::HttpResponseInfo* http_info,
                        int64 response_data_size);
 
   const GURL& manifest_url() const { return manifest_url_; }
   int64 response_id() const { return response_id_; }
   const net::HttpResponseInfo* http_response_info() const {
     return http_response_info_.get();
   }
   int64 response_data_size() const { return response_data_size_; }
 
  private:
   friend class base::RefCounted<AppCacheResponseInfo>;
   virtual ~AppCacheResponseInfo();
 
   const GURL manifest_url_;
   const int64 response_id_;
   const scoped_ptr<net::HttpResponseInfo> http_response_info_;
   const int64 response_data_size_;
   const AppCacheService* service_;
 };
 
 // A refcounted wrapper for HttpResponseInfo so we can apply the
 // refcounting semantics used with IOBuffer with these structures too.
-struct WEBKIT_STORAGE_EXPORT HttpResponseInfoIOBuffer
+struct WEBKIT_STORAGE_BROWSER_EXPORT HttpResponseInfoIOBuffer
     : public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> {
   scoped_ptr<net::HttpResponseInfo> http_info;
   int response_data_size;
 
   HttpResponseInfoIOBuffer();
   explicit HttpResponseInfoIOBuffer(net::HttpResponseInfo* info);
 
  private:
   friend class base::RefCountedThreadSafe<HttpResponseInfoIOBuffer>;
   virtual ~HttpResponseInfoIOBuffer();
 };
 
 // Low level storage API used by the response reader and writer.
-class WEBKIT_STORAGE_EXPORT AppCacheDiskCacheInterface {
+class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCacheInterface {
  public:
   class Entry {
    public:
     virtual int Read(int index, int64 offset, net::IOBuffer* buf, int buf_len,
                      const net::CompletionCallback& callback) = 0;
     virtual int Write(int index, int64 offset, net::IOBuffer* buf, int buf_len,
                       const net::CompletionCallback& callback) = 0;
     virtual int64 GetSize(int index) = 0;
     virtual void Close() = 0;
    protected:
     virtual ~Entry() {}
   };
 
   virtual int CreateEntry(int64 key, Entry** entry,
                           const net::CompletionCallback& callback) = 0;
   virtual int OpenEntry(int64 key, Entry** entry,
                         const net::CompletionCallback& callback) = 0;
   virtual int DoomEntry(int64 key, const net::CompletionCallback& callback) = 0;
 
  protected:
   friend class base::RefCounted<AppCacheDiskCacheInterface>;
   virtual ~AppCacheDiskCacheInterface() {}
 };
 
 // Common base class for response reader and writer.
-class WEBKIT_STORAGE_EXPORT AppCacheResponseIO {
+class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseIO();
   int64 response_id() const { return response_id_; }
 
  protected:
   AppCacheResponseIO(int64 response_id,
                      int64 group_id,
                      AppCacheDiskCacheInterface* disk_cache);
 
   virtual void OnIOComplete(int result) = 0;
@@ skipping 15 matching lines @@
   base::WeakPtrFactory<AppCacheResponseIO> weak_factory_;
 
  private:
   void OnRawIOComplete(int result);
 };
 
 // Reads existing response data from storage. If the object is deleted
 // and there is a read in progress, the implementation will return
 // immediately but will take care of any side effect of cancelling the
 // operation.  In other words, instances are safe to delete at will.
-class WEBKIT_STORAGE_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
+class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseReader
+    : public AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseReader();
 
   // Reads http info from storage. Always returns the result of the read
   // asynchronously through the 'callback'. Returns the number of bytes read
   // or a net:: error code. Guaranteed to not perform partial reads of
   // the info data. The reader acquires a reference to the 'info_buf' until
   // completion at which time the callback is invoked with either a negative
   // error code or the number of bytes read. The 'info_buf' argument should
   // contain a NULL http_info when ReadInfo is called. The 'callback' is a
@@ skipping 41 matching lines @@
   int range_length_;
   int read_position_;
   net::CompletionCallback open_callback_;
   base::WeakPtrFactory<AppCacheResponseReader> weak_factory_;
 };
 
 // Writes new response data to storage. If the object is deleted
 // and there is a write in progress, the implementation will return
 // immediately but will take care of any side effect of cancelling the
 // operation. In other words, instances are safe to delete at will.
-class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
+class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseWriter
+    : public AppCacheResponseIO {
  public:
   virtual ~AppCacheResponseWriter();
 
   // Writes the http info to storage. Always returns the result of the write
   // asynchronously through the 'callback'. Returns the number of bytes written
   // or a net:: error code. The writer acquires a reference to the 'info_buf'
   // until completion at which time the callback is invoked with either a
   // negative error code or the number of bytes written. The 'callback' is a
   // required parameter. The contents of 'info_buf' are not modified.
   // Should only be called where there is no Write operation in progress.
@@ skipping 43 matching lines @@
   int write_position_;
   int write_amount_;
   CreationPhase creation_phase_;
   net::CompletionCallback create_callback_;
   base::WeakPtrFactory<AppCacheResponseWriter> weak_factory_;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_