Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_group.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_BROWSER_APPCACHE_APPCACHE_GROUP_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
 
 #include <map>
 #include <vector>
 
 #include "base/cancelable_callback.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/time/time.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheGroupTest, StartUpdate);
 FORWARD_DECLARE_TEST(AppCacheGroupTest, CancelUpdate);
 FORWARD_DECLARE_TEST(AppCacheGroupTest, QueueUpdate);
 FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyChecking);
 FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyDownloading);
 class AppCacheUpdateJobTest;
 class MockAppCacheStorage;
 }
 
-namespace appcache {
+namespace content {
 
 class AppCache;
 class AppCacheHost;
 class AppCacheStorage;
 class AppCacheUpdateJob;
 class HostObserver;
 
 // Collection of application caches identified by the same manifest URL.
 // A group exists as long as it is in use by a host or is being updated.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheGroup
+class CONTENT_EXPORT AppCacheGroup
     : public base::RefCounted<AppCacheGroup> {
  public:
 
-  class WEBKIT_STORAGE_BROWSER_EXPORT UpdateObserver {
+  class CONTENT_EXPORT UpdateObserver {
     public:
       // Called just after an appcache update has completed.
       virtual void OnUpdateComplete(AppCacheGroup* group) = 0;
       virtual ~UpdateObserver() {}
   };
 
   enum UpdateAppCacheStatus {
     IDLE,
     CHECKING,
     DOWNLOADING,
@@ skipping 110 matching lines @@
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, StartUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, CancelUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, QueueUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyChecking);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyDownloading);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_