Move all remaining appcache-related code to content namespace

content/public/common/appcache_interfaces.h

Index: content/public/common/appcache_interfaces.h
diff --git a/webkit/common/appcache/appcache_interfaces.h b/content/public/common/appcache_interfaces.h
similarity index 81%
rename from webkit/common/appcache/appcache_interfaces.h
rename to content/public/common/appcache_interfaces.h
index 558d6e2e4dde841fb718a132feda23acb2acf4c4..a377cbc6b7a6788dcef9e7ce72e80e41b1e1cda4 100644
--- a/webkit/common/appcache/appcache_interfaces.h
+++ b/content/public/common/appcache_interfaces.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
-#define WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
+#ifndef CONTENT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
+#define CONTENT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
 
 #include <string>
 #include <vector>
@@ -11,14 +11,14 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/time/time.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/common/webkit_storage_common_export.h"
 
 namespace net {
 class URLRequest;
 }
 
-namespace appcache {
+namespace content {
 
 // Defines constants, types, and abstract classes used in the main
 // process and in child processes.
@@ -76,7 +76,7 @@ enum AppCacheErrorReason {
   APPCACHE_ERROR_REASON_LAST = APPCACHE_UNKNOWN_ERROR
 };
 
-struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheInfo {
+struct CONTENT_EXPORT AppCacheInfo {

[michaeln, 2014/06/17 23:34:29]

this struct is needed but not the other structs

   AppCacheInfo();
   ~AppCacheInfo();
 
@@ -94,7 +94,7 @@ struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheInfo {
 typedef std::vector<AppCacheInfo> AppCacheInfoVector;

[michaeln, 2014/06/17 23:34:29]

this is needed too

 
 // Type to hold information about a single appcache resource.
-struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheResourceInfo {
+struct CONTENT_EXPORT AppCacheResourceInfo {
   AppCacheResourceInfo();
   ~AppCacheResourceInfo();
 
@@ -109,7 +109,7 @@ struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheResourceInfo {
   int64 response_id;
 };
 
-struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheErrorDetails {
+struct CONTENT_EXPORT AppCacheErrorDetails {
   AppCacheErrorDetails();
   AppCacheErrorDetails(std::string message,
                AppCacheErrorReason reason,
@@ -127,7 +127,7 @@ struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheErrorDetails {
 
 typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector;
 
-struct WEBKIT_STORAGE_COMMON_EXPORT Namespace {
+struct CONTENT_EXPORT Namespace {

[michaeln, 2014/06/17 23:34:29]

this is an overly generic name for the larger content namespace

   Namespace();  // Type is set to APPCACHE_FALLBACK_NAMESPACE by default.
   Namespace(AppCacheNamespaceType type, const GURL& url, const GURL& target,
             bool is_pattern);
@@ -147,10 +147,10 @@ struct WEBKIT_STORAGE_COMMON_EXPORT Namespace {
 typedef std::vector<Namespace> NamespaceVector;
 
 // Interface used by backend (browser-process) to talk to frontend (renderer).
-class WEBKIT_STORAGE_COMMON_EXPORT AppCacheFrontend {
+class CONTENT_EXPORT AppCacheFrontend {
  public:
   virtual void OnCacheSelected(
-      int host_id, const appcache::AppCacheInfo& info) = 0;
+      int host_id, const AppCacheInfo& info) = 0;
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
                                AppCacheStatus status) = 0;
   virtual void OnEventRaised(const std::vector<int>& host_ids,
@@ -160,7 +160,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT AppCacheFrontend {
                                      int num_total, int num_complete) = 0;
   virtual void OnErrorEventRaised(
       const std::vector<int>& host_ids,
-      const appcache::AppCacheErrorDetails& details) = 0;
+      const AppCacheErrorDetails& details) = 0;
   virtual void OnContentBlocked(int host_id,
                                 const GURL& manifest_url) = 0;
   virtual void OnLogMessage(int host_id, AppCacheLogLevel log_level,
@@ -169,7 +169,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT AppCacheFrontend {
 };
 
 // Interface used by frontend (renderer) to talk to backend (browser-process).
-class WEBKIT_STORAGE_COMMON_EXPORT AppCacheBackend {
+class CONTENT_EXPORT AppCacheBackend {
  public:
   virtual void RegisterHost(int host_id) = 0;
   virtual void UnregisterHost(int host_id) = 0;
@@ -201,22 +201,22 @@ class WEBKIT_STORAGE_COMMON_EXPORT AppCacheBackend {
 // Note: These are also defined elsewhere in the chrome code base in
 // url_contants.h .cc, however the appcache library doesn't not have
 // any dependencies on the chrome library, so we can't use them in here.
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpScheme[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpsScheme[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpGETMethod[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpHEADMethod[];
+CONTENT_EXPORT extern const char kHttpScheme[];
+CONTENT_EXPORT extern const char kHttpsScheme[];
+CONTENT_EXPORT extern const char kHttpGETMethod[];
+CONTENT_EXPORT extern const char kHttpHEADMethod[];

[michaeln, 2014/06/17 23:34:29]

definitely these (and the other two) str constants do not belong in the public
api

 
 // CommandLine flag to turn this experimental feature on.
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kEnableExecutableHandlers[];
+CONTENT_EXPORT extern const char kEnableExecutableHandlers[];
 
-WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeSupported(const GURL& url);
-WEBKIT_STORAGE_COMMON_EXPORT bool IsMethodSupported(const std::string& method);
-WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeAndMethodSupported(
+CONTENT_EXPORT bool IsSchemeSupported(const GURL& url);
+CONTENT_EXPORT bool IsMethodSupported(const std::string& method);
+CONTENT_EXPORT bool IsSchemeAndMethodSupported(

[michaeln, 2014/06/17 23:34:29]

ditto these do not belong in public and also overly generic names for the larger
content namespace

     const net::URLRequest* request);
 
-WEBKIT_STORAGE_COMMON_EXPORT extern const base::FilePath::CharType
+CONTENT_EXPORT extern const base::FilePath::CharType
     kAppCacheDatabaseName[];
 
 }  // namespace
 
-#endif  // WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
+#endif  // CONTENT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_