Index: storage/browser/database/database_tracker.h |
diff --git a/webkit/browser/database/database_tracker.h b/storage/browser/database/database_tracker.h |
similarity index 95% |
rename from webkit/browser/database/database_tracker.h |
rename to storage/browser/database/database_tracker.h |
index 4d4e567e1f6e054e51dd4532c4ef9014cd5f7eb0..dd2df2b9b6978776e2bc6dece77a60bac8f38505 100644 |
--- a/webkit/browser/database/database_tracker.h |
+++ b/storage/browser/database/database_tracker.h |
@@ -19,8 +19,8 @@ |
#include "base/strings/string_util.h" |
#include "base/time/time.h" |
#include "net/base/completion_callback.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/database/database_connections.h" |
+#include "storage/common/storage_export.h" |
+#include "storage/common/database/database_connections.h" |
namespace base { |
class MessageLoopProxy; |
@@ -43,15 +43,13 @@ class SpecialStoragePolicy; |
namespace webkit_database { |
-WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType |
- kDatabaseDirectoryName[]; |
-WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType |
- kTrackerDatabaseFileName[]; |
+STORAGE_EXPORT extern const base::FilePath::CharType kDatabaseDirectoryName[]; |
+STORAGE_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_BROWSER_EXPORT OriginInfo { |
+class STORAGE_EXPORT OriginInfo { |
public: |
OriginInfo(); |
OriginInfo(const OriginInfo& origin_info); |
@@ -85,7 +83,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT OriginInfo { |
// 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_BROWSER_EXPORT DatabaseTracker |
+class STORAGE_EXPORT DatabaseTracker |
: public base::RefCountedThreadSafe<DatabaseTracker> { |
public: |
class Observer { |
@@ -184,7 +182,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker |
private: |
friend class base::RefCountedThreadSafe<DatabaseTracker>; |
friend class content::DatabaseTracker_TestHelper_Test; |
- friend class content::MockDatabaseTracker; // for testing |
+ friend class content::MockDatabaseTracker; // for testing |
typedef std::map<std::string, std::set<base::string16> > DatabaseSet; |
typedef std::vector<std::pair<net::CompletionCallback, DatabaseSet> > |
@@ -242,8 +240,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker |
CachedOriginInfo* MaybeGetCachedOriginInfo( |
const std::string& origin_identifier, |
bool create_if_needed); |
- CachedOriginInfo* GetCachedOriginInfo( |
- const std::string& origin_identifier) { |
+ CachedOriginInfo* GetCachedOriginInfo(const std::string& origin_identifier) { |
return MaybeGetCachedOriginInfo(origin_identifier, true); |
} |
@@ -261,7 +258,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker |
origin_identifier, database_name, NULL); |
} |
- |
void ScheduleDatabaseForDeletion(const std::string& origin_identifier, |
const base::string16& database_name); |
// Schedule a set of open databases for deletion. If non-null, callback is |