Fix webkit_storage exports definitions

webkit/browser/database/database_tracker.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_DATABASE_DATABASE_TRACKER_H_
 #define WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/platform_file.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/time.h"
 #include "net/base/completion_callback.h"
+#include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/database/database_connections.h"
-#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace sql {
 class Connection;
 class MetaTable;
 }
 
 namespace quota {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
 namespace webkit_database {
 
-WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType
+WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType
     kDatabaseDirectoryName[];
-WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType
+WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType
     kTrackerDatabaseFileName[];
 
 class DatabasesTable;
 
 // This class is used to store information about all databases in an origin.
-class WEBKIT_STORAGE_EXPORT OriginInfo {
+class WEBKIT_STORAGE_BROWSER_EXPORT OriginInfo {
  public:
   OriginInfo();
   OriginInfo(const OriginInfo& origin_info);
   ~OriginInfo();
 
   const base::string16& GetOrigin() const { return origin_; }
   int64 TotalSize() const { return total_size_; }
   void GetAllDatabaseNames(std::vector<base::string16>* databases) const;
   int64 GetDatabaseSize(const base::string16& database_name) const;
   base::string16 GetDatabaseDescription(
@@ skipping 13 matching lines @@
 // This class manages the main database and keeps track of open databases.
 //
 // The data in this class is not thread-safe, so all methods of this class
 // should be called on the same thread. The only exceptions are the ctor(),
 // the dtor() and the database_directory() and quota_manager_proxy() getters.
 //
 // Furthermore, some methods of this class have to read/write data from/to
 // the disk. Therefore, in a multi-threaded application, all methods of this
 // class should be called on the thread dedicated to file operations (file
 // thread in the browser process, for example), if such a thread exists.
-class WEBKIT_STORAGE_EXPORT DatabaseTracker
+class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker
     : public base::RefCountedThreadSafe<DatabaseTracker> {
  public:
   class Observer {
    public:
     virtual void OnDatabaseSizeChanged(const base::string16& origin_identifier,
                                        const base::string16& database_name,
                                        int64 database_size) = 0;
     virtual void OnDatabaseScheduledForDeletion(
         const base::string16& origin_identifier,
         const base::string16& database_name) = 0;
@@ skipping 209 matching lines @@
   // this map to assign directory names that do not reveal this information.
   OriginDirectoriesMap incognito_origin_directories_;
   int incognito_origin_directories_generator_;
 
   FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_