Combine storage_browser_export.h and storage_common_export.h

webkit/common/database/database_connections.h

 // Copyright (c) 2011 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_COMMON_DATABASE_DATABASE_CONNECTIONS_H_
 #define WEBKIT_COMMON_DATABASE_DATABASE_CONNECTIONS_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace storage {
 
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections {
+class STORAGE_EXPORT DatabaseConnections {
  public:
   DatabaseConnections();
   ~DatabaseConnections();
 
   bool IsEmpty() const;
   bool IsDatabaseOpened(const std::string& origin_identifier,
                         const base::string16& database_name) const;
   bool IsOriginUsed(const std::string& origin_identifier) const;
 
   // Returns true if this is the first connection.
@@ skipping 28 matching lines @@
 
   // Returns true if the last connection was removed.
   bool RemoveConnectionsHelper(const std::string& origin_identifier,
                                const base::string16& database_name,
                                int num_connections);
 };
 
 // A wrapper class that provides thread-safety and the
 // ability to wait until all connections have closed.
 // Intended for use in renderer processes.
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnectionsWrapper
+class STORAGE_EXPORT DatabaseConnectionsWrapper
     : public base::RefCountedThreadSafe<DatabaseConnectionsWrapper> {
  public:
   DatabaseConnectionsWrapper();
 
   // The Wait and Has methods should only be called on the
   // main thread (the thread on which the wrapper is constructed).
   void WaitForAllDatabasesToClose();
   bool HasOpenConnections();
 
   // Add and Remove may be called on any thread.
   void AddOpenConnection(const std::string& origin_identifier,
                          const base::string16& database_name);
   void RemoveOpenConnection(const std::string& origin_identifier,
                             const base::string16& database_name);
  private:
   ~DatabaseConnectionsWrapper();
   friend class base::RefCountedThreadSafe<DatabaseConnectionsWrapper>;
 
   bool waiting_for_dbs_to_close_;
   base::Lock open_connections_lock_;
   DatabaseConnections open_connections_;
   scoped_refptr<base::MessageLoopProxy> main_thread_;
 };
 
 }  // namespace storage
 
 #endif  // WEBKIT_COMMON_DATABASE_DATABASE_CONNECTIONS_H_