Combine storage_browser_export.h and storage_common_export.h

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.h"
 #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/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/database/database_connections.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace content {
 class DatabaseTracker_TestHelper_Test;
 class MockDatabaseTracker;
 }
 
@@ skipping 276 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 storage
 
 #endif  // WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_