Move appcache_test_helper.* to content/public/test/

BUG=338338
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/158323005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253052 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 33 insertions, 35 deletions

diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index 36d70c7..8195c4a 100644
--- a/content/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -11,17 +11,15 @@
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/test/test_browser_context.h"
+#include "content/test/appcache_test_helper.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/appcache/appcache_database.h"
 #include "webkit/browser/appcache/appcache_storage_impl.h"
-#include "webkit/browser/appcache/appcache_test_helper.h"
 #include "webkit/browser/quota/mock_special_storage_policy.h"
 
 #include <set>
 
-using appcache::AppCacheTestHelper;
-
 namespace content {
 namespace {
 const base::FilePath::CharType kTestingAppCacheDirname[] =
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e3316c8..27506e7 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -116,6 +116,8 @@
         'browser/renderer_host/media/mock_media_observer.h',
         'gpu/gpu_idirect3d9_mock_win.cc',
         'gpu/gpu_idirect3d9_mock_win.h',
+        'test/appcache_test_helper.cc',
+        'test/appcache_test_helper.h',
         'test/content_test_suite.cc',
         'test/content_test_suite.h',
         'test/mock_google_streaming_server.cc',
@@ -180,10 +182,6 @@
         'test/weburl_loader_mock.h',
         'test/weburl_loader_mock_factory.cc',
         'test/weburl_loader_mock_factory.h',
-
-        # TODO(kinuko): Those files should be moved to content/public/test.
-        '../webkit/browser/appcache/appcache_test_helper.cc',
-        '../webkit/browser/appcache/appcache_test_helper.h',
       ],
       'conditions': [
         ['OS == "ios"', {
diff --git a/webkit/browser/appcache/appcache_test_helper.cc b/content/test/appcache_test_helper.cc
index f457d40..717b84f 100644
--- a/webkit/browser/appcache/appcache_test_helper.cc
+++ b/content/test/appcache_test_helper.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "webkit/browser/appcache/appcache_test_helper.h"
+#include "content/test/appcache_test_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -13,7 +13,7 @@
 #include "webkit/browser/appcache/appcache_group.h"
 #include "webkit/browser/appcache/appcache_service.h"
 
-namespace appcache {
+namespace content {
 
 AppCacheTestHelper::AppCacheTestHelper()
     : group_id_(0),
@@ -24,24 +24,24 @@ AppCacheTestHelper::AppCacheTestHelper()
 AppCacheTestHelper::~AppCacheTestHelper() {}
 
 void AppCacheTestHelper::OnGroupAndNewestCacheStored(
-    AppCacheGroup* /*group*/,
-    AppCache* /*newest_cache*/,
+    appcache::AppCacheGroup* /*group*/,
+    appcache::AppCache* /*newest_cache*/,
     bool success,
     bool /*would_exceed_quota*/) {
   ASSERT_TRUE(success);
   base::MessageLoop::current()->Quit();
 }
 
-void AppCacheTestHelper::AddGroupAndCache(AppCacheService* appcache_service,
-                                          const GURL& manifest_url) {
-  AppCacheGroup* appcache_group =
-      new AppCacheGroup(appcache_service->storage(),
-                        manifest_url,
-                        ++group_id_);
-  AppCache* appcache = new AppCache(appcache_service->storage(),
-                                    ++appcache_id_);
-  AppCacheEntry entry(AppCacheEntry::MANIFEST,
-                      ++response_id_);
+void AppCacheTestHelper::AddGroupAndCache(appcache::AppCacheService*
+    appcache_service, const GURL& manifest_url) {
+  appcache::AppCacheGroup* appcache_group =
+      new appcache::AppCacheGroup(appcache_service->storage(),
+                                  manifest_url,
+                                  ++group_id_);
+  appcache::AppCache* appcache = new appcache::AppCache(
+      appcache_service->storage(), ++appcache_id_);
+  appcache::AppCacheEntry entry(appcache::AppCacheEntry::MANIFEST,
+                                ++response_id_);
   appcache->AddEntry(manifest_url, entry);
   appcache->set_complete(true);
   appcache_group->AddCache(appcache);
@@ -52,9 +52,9 @@ void AppCacheTestHelper::AddGroupAndCache(AppCacheService* appcache_service,
   base::MessageLoop::current()->Run();
 }
 
-void AppCacheTestHelper::GetOriginsWithCaches(AppCacheService* appcache_service,
-                                              std::set<GURL>* origins) {
-  appcache_info_ = new AppCacheInfoCollection;
+void AppCacheTestHelper::GetOriginsWithCaches(appcache::AppCacheService*
+    appcache_service, std::set<GURL>* origins) {
+  appcache_info_ = new appcache::AppCacheInfoCollection;
   origins_ = origins;
   appcache_service->GetAllAppCacheInfo(
       appcache_info_.get(),
@@ -66,7 +66,7 @@ void AppCacheTestHelper::GetOriginsWithCaches(AppCacheService* appcache_service,
 }
 
 void AppCacheTestHelper::OnGotAppCacheInfo(int rv) {
-  typedef std::map<GURL, AppCacheInfoVector> InfoByOrigin;
+  typedef std::map<GURL, appcache::AppCacheInfoVector> InfoByOrigin;
 
   origins_->clear();
   for (InfoByOrigin::const_iterator origin =
@@ -77,4 +77,4 @@ void AppCacheTestHelper::OnGotAppCacheInfo(int rv) {
   base::MessageLoop::current()->Quit();
 }
 
-}  // namespace appcache
+}  // namespace content
diff --git a/webkit/browser/appcache/appcache_test_helper.h b/content/test/appcache_test_helper.h
index 4e21cb3..0b5ee4a 100644
--- a/webkit/browser/appcache/appcache_test_helper.h
+++ b/content/test/appcache_test_helper.h
@@ -1,17 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_TEST_HELPER_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_TEST_HELPER_H_
+#ifndef CONTENT_PUBLIC_TEST_APPCACHE_TEST_HELPER_H_
+#define CONTENT_PUBLIC_TEST_APPCACHE_TEST_HELPER_H_
 
 #include <set>
 
 #include "webkit/browser/appcache/appcache_storage.h"
 
 namespace appcache {
-
 class AppCacheService;
+}
+
+namespace content {
 
 // Helper class for inserting data into a ChromeAppCacheService and reading it
 // back.
@@ -19,10 +21,10 @@ class AppCacheTestHelper : public appcache::AppCacheStorage::Delegate {
  public:
   AppCacheTestHelper();
   virtual ~AppCacheTestHelper();
-  void AddGroupAndCache(AppCacheService* appcache_service,
+  void AddGroupAndCache(appcache::AppCacheService* appcache_service,
                         const GURL& manifest_url);
 
-  void GetOriginsWithCaches(AppCacheService* appcache_service,
+  void GetOriginsWithCaches(appcache::AppCacheService* appcache_service,
                             std::set<GURL>* origins);
  private:
   virtual void OnGroupAndNewestCacheStored(
@@ -41,6 +43,6 @@ class AppCacheTestHelper : public appcache::AppCacheStorage::Delegate {
   DISALLOW_COPY_AND_ASSIGN(AppCacheTestHelper);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_TEST_HELPER_H_
+#endif  // CONTENT_PUBLIC_TEST_APPCACHE_TEST_HELPER_H_