Fix webkit_storage exports definitions

webkit/browser/quota/quota_manager.h

 // 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.
 
 #ifndef WEBKIT_BROWSER_QUOTA_QUOTA_MANAGER_H_
 #define WEBKIT_BROWSER_QUOTA_QUOTA_MANAGER_H_
 
 #include <deque>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "webkit/browser/quota/quota_callbacks.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_database.h"
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/browser/quota/special_storage_policy.h"
-#include "webkit/storage/webkit_storage_export.h"
+#include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 class SingleThreadTaskRunner;
 }
 
 namespace quota_internals {
 class QuotaInternalsProxy;
 }
 
 namespace quota {
 
 class MockQuotaManager;
 class QuotaDatabase;
 class QuotaManagerProxy;
 class QuotaTemporaryStorageEvictor;
 class UsageTracker;
 
 struct QuotaManagerDeleter;
 
-struct WEBKIT_STORAGE_EXPORT UsageAndQuota {
+struct WEBKIT_STORAGE_BROWSER_EXPORT UsageAndQuota {
   int64 usage;
   int64 global_limited_usage;
   int64 quota;
   int64 available_disk_space;
 
   UsageAndQuota();
   UsageAndQuota(int64 usage,
                 int64 global_limited_usage,
                 int64 quota,
                 int64 available_disk_space);
 };
 
 // An interface called by QuotaTemporaryStorageEvictor.
-class WEBKIT_STORAGE_EXPORT QuotaEvictionHandler {
+class WEBKIT_STORAGE_BROWSER_EXPORT QuotaEvictionHandler {
  public:
   typedef base::Callback<void(const GURL&)> GetLRUOriginCallback;
   typedef StatusCallback EvictOriginDataCallback;
   typedef base::Callback<void(QuotaStatusCode status,
                               const UsageAndQuota& usage_and_quota)>
       UsageAndQuotaCallback;
 
   // Returns the least recently used origin.  It might return empty
   // GURL when there are no evictable origins.
   virtual void GetLRUOrigin(
@@ skipping 18 matching lines @@
         type(type),
         usage(usage) {}
   std::string host;
   StorageType type;
   int64 usage;
 };
 
 // The quota manager class.  This class is instantiated per profile and
 // held by the profile.  With the exception of the constructor and the
 // proxy() method, all methods should only be called on the IO thread.
-class WEBKIT_STORAGE_EXPORT QuotaManager
+class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManager
     : public QuotaTaskObserver,
       public QuotaEvictionHandler,
       public base::RefCountedThreadSafe<QuotaManager, QuotaManagerDeleter> {
  public:
   typedef base::Callback<void(QuotaStatusCode,
                               int64 /* usage */,
                               int64 /* quota */)>
       GetUsageAndQuotaCallback;
 
   static const int64 kIncognitoDefaultQuotaLimit;
@@ skipping 308 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(QuotaManager);
 };
 
 struct QuotaManagerDeleter {
   static void Destruct(const QuotaManager* manager) {
     manager->DeleteOnCorrectThread();
   }
 };
 
 // The proxy may be called and finally released on any thread.
-class WEBKIT_STORAGE_EXPORT QuotaManagerProxy
+class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManagerProxy
     : public base::RefCountedThreadSafe<QuotaManagerProxy> {
  public:
   virtual void RegisterClient(QuotaClient* client);
   virtual void NotifyStorageAccessed(QuotaClient::ID client_id,
                                      const GURL& origin,
                                      StorageType type);
   virtual void NotifyStorageModified(QuotaClient::ID client_id,
                                      const GURL& origin,
                                      StorageType type,
                                      int64 delta);
@@ skipping 19 matching lines @@
 
   QuotaManager* manager_;  // only accessed on the io thread
   scoped_refptr<base::SingleThreadTaskRunner> io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerProxy);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_BROWSER_QUOTA_QUOTA_MANAGER_H_