Combine storage_browser_export.h and storage_common_export.h

webkit/browser/quota/usage_tracker.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_USAGE_TRACKER_H_
 #define WEBKIT_BROWSER_QUOTA_USAGE_TRACKER_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "url/gurl.h"
 #include "webkit/browser/quota/quota_callbacks.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/browser/quota/special_storage_policy.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
 class ClientUsageTracker;
 class StorageMonitor;
 
 // A helper class that gathers and tracks the amount of data stored in
 // all quota clients.
 // An instance of this class is created per storage type.
 class STORAGE_EXPORT UsageTracker : public QuotaTaskObserver {
@@ skipping 159 matching lines @@
   HostUsageAccumulatorMap host_usage_accumulators_;
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientUsageTracker);
 };
 
 }  // namespace storage
 
 #endif  // WEBKIT_BROWSER_QUOTA_USAGE_TRACKER_H_