summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 20:57:55 +0000
committerpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 20:57:55 +0000
commit98d6d4562142f682d3bc8419c0f29a4f7fd0f263 (patch)
tree005b061e143cefc1d2c890a700b28edb57b8573d /chrome/browser
parent0282b03c86d52533c58af2c6e8de4c7bc7a89155 (diff)
downloadchromium_src-98d6d4562142f682d3bc8419c0f29a4f7fd0f263.zip
chromium_src-98d6d4562142f682d3bc8419c0f29a4f7fd0f263.tar.gz
chromium_src-98d6d4562142f682d3bc8419c0f29a4f7fd0f263.tar.bz2
Move all remaining appcache-related code to content namespace
This introduces NO FUNCTIONAL CHANGES. It is strictly a file move and namespace change. BUG=338338 R=michaeln@chromium.org TBR=cevans, darin Review URL: https://codereview.chromium.org/344493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browsing_data/browsing_data_appcache_helper.cc14
-rw-r--r--chrome/browser/browsing_data/browsing_data_appcache_helper.h12
-rw-r--r--chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc4
-rw-r--r--chrome/browser/browsing_data/browsing_data_remover_unittest.cc2
-rw-r--r--chrome/browser/browsing_data/cookies_tree_model.cc6
-rw-r--r--chrome/browser/browsing_data/cookies_tree_model.h8
-rw-r--r--chrome/browser/browsing_data/local_data_container.cc6
-rw-r--r--chrome/browser/browsing_data/local_data_container.h2
-rw-r--r--chrome/browser/content_settings/local_shared_objects_container.cc4
-rw-r--r--chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc2
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc2
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h2
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc2
-rw-r--r--chrome/browser/renderer_host/offline_resource_throttle.cc4
-rw-r--r--chrome/browser/renderer_host/offline_resource_throttle.h6
-rw-r--r--chrome/browser/ui/cocoa/content_settings/cookie_details.h4
-rw-r--r--chrome/browser/ui/cocoa/content_settings/cookie_details.mm4
-rw-r--r--chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm2
-rw-r--r--chrome/browser/ui/webui/cookies_tree_model_util.cc2
19 files changed, 43 insertions, 45 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
index 9810d02..8fb5d42 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
@@ -12,8 +12,6 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/storage_partition.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_storage.h"
using content::BrowserThread;
using content::BrowserContext;
@@ -29,7 +27,7 @@ void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
DCHECK(!is_fetching_);
DCHECK_EQ(false, callback.is_null());
is_fetching_ = true;
- info_collection_ = new appcache::AppCacheInfoCollection;
+ info_collection_ = new content::AppCacheInfoCollection;
completion_callback_ = callback;
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -65,7 +63,7 @@ void BrowsingDataAppCacheHelper::OnFetchComplete(int rv) {
if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
// Filter out appcache info entries for non-websafe schemes. Extension state
// and DevTools, for example, are not considered browsing data.
- typedef std::map<GURL, appcache::AppCacheInfoVector> InfoByOrigin;
+ typedef std::map<GURL, content::AppCacheInfoVector> InfoByOrigin;
InfoByOrigin& origin_map = info_collection_->infos_by_origin;
for (InfoByOrigin::iterator origin = origin_map.begin();
origin != origin_map.end();) {
@@ -92,7 +90,7 @@ CannedBrowsingDataAppCacheHelper::CannedBrowsingDataAppCacheHelper(
Profile* profile)
: BrowsingDataAppCacheHelper(profile),
profile_(profile) {
- info_collection_ = new appcache::AppCacheInfoCollection;
+ info_collection_ = new content::AppCacheInfoCollection;
}
CannedBrowsingDataAppCacheHelper* CannedBrowsingDataAppCacheHelper::Clone() {
@@ -109,17 +107,17 @@ void CannedBrowsingDataAppCacheHelper::AddAppCache(const GURL& manifest_url) {
return; // Ignore non-websafe schemes.
OriginAppCacheInfoMap& origin_map = info_collection_->infos_by_origin;
- appcache::AppCacheInfoVector& appcache_infos_ =
+ content::AppCacheInfoVector& appcache_infos_ =
origin_map[manifest_url.GetOrigin()];
- for (appcache::AppCacheInfoVector::iterator
+ for (content::AppCacheInfoVector::iterator
appcache = appcache_infos_.begin(); appcache != appcache_infos_.end();
++appcache) {
if (appcache->manifest_url == manifest_url)
return;
}
- appcache::AppCacheInfo info;
+ content::AppCacheInfo info;
info.manifest_url = manifest_url;
appcache_infos_.push_back(info);
}
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper.h b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
index 8a23ba2..6a7ea6a34 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
@@ -7,13 +7,13 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
+#include "content/public/browser/appcache_service.h"
#include "net/base/completion_callback.h"
#include "url/gurl.h"
-#include "webkit/browser/appcache/appcache_service.h"
class Profile;
-namespace appcache {
+namespace content {
class AppCacheService;
}
@@ -22,14 +22,14 @@ class AppCacheService;
class BrowsingDataAppCacheHelper
: public base::RefCountedThreadSafe<BrowsingDataAppCacheHelper> {
public:
- typedef std::map<GURL, appcache::AppCacheInfoVector> OriginAppCacheInfoMap;
+ typedef std::map<GURL, content::AppCacheInfoVector> OriginAppCacheInfoMap;
explicit BrowsingDataAppCacheHelper(Profile* profile);
virtual void StartFetching(const base::Closure& completion_callback);
virtual void DeleteAppCacheGroup(const GURL& manifest_url);
- appcache::AppCacheInfoCollection* info_collection() const {
+ content::AppCacheInfoCollection* info_collection() const {
DCHECK(!is_fetching_);
return info_collection_.get();
}
@@ -39,13 +39,13 @@ class BrowsingDataAppCacheHelper
virtual ~BrowsingDataAppCacheHelper();
base::Closure completion_callback_;
- scoped_refptr<appcache::AppCacheInfoCollection> info_collection_;
+ scoped_refptr<content::AppCacheInfoCollection> info_collection_;
private:
void OnFetchComplete(int rv);
bool is_fetching_;
- appcache::AppCacheService* appcache_service_;
+ content::AppCacheService* appcache_service_;
net::CancelableCompletionCallback appcache_info_callback_;
DISALLOW_COPY_AND_ASSIGN(BrowsingDataAppCacheHelper);
diff --git a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
index 4589574..5040b1e 100644
--- a/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
@@ -56,7 +56,7 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, SetInfo) {
base::Unretained(&callback)));
ASSERT_TRUE(callback.have_result());
- std::map<GURL, appcache::AppCacheInfoVector>& collection =
+ std::map<GURL, content::AppCacheInfoVector>& collection =
helper->info_collection()->infos_by_origin;
ASSERT_EQ(2u, collection.size());
@@ -88,7 +88,7 @@ TEST_F(CannedBrowsingDataAppCacheHelperTest, Unique) {
base::Unretained(&callback)));
ASSERT_TRUE(callback.have_result());
- std::map<GURL, appcache::AppCacheInfoVector>& collection =
+ std::map<GURL, content::AppCacheInfoVector>& collection =
helper->info_collection()->infos_by_origin;
ASSERT_EQ(1u, collection.size());
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index a47a92f..c4de8ee 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -142,7 +142,7 @@ class TestStoragePartition : public StoragePartition {
virtual quota::QuotaManager* GetQuotaManager() OVERRIDE {
return NULL;
}
- virtual appcache::AppCacheService* GetAppCacheService() OVERRIDE {
+ virtual content::AppCacheService* GetAppCacheService() OVERRIDE {
return NULL;
}
virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE {
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 5663eb0..f1c15e2 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -214,7 +214,7 @@ CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitSessionStorage(
CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitAppCache(
const GURL& origin,
- const appcache::AppCacheInfo* appcache_info) {
+ const content::AppCacheInfo* appcache_info) {
Init(TYPE_APPCACHE);
this->appcache_info = appcache_info;
this->origin = origin;
@@ -301,7 +301,7 @@ CookieTreeNode::DetailedInfo CookieTreeCookieNode::GetDetailedInfo() const {
CookieTreeAppCacheNode::CookieTreeAppCacheNode(
const GURL& origin_url,
- std::list<appcache::AppCacheInfo>::iterator appcache_info)
+ std::list<content::AppCacheInfo>::iterator appcache_info)
: CookieTreeNode(base::UTF8ToUTF16(appcache_info->manifest_url.spec())),
origin_url_(origin_url),
appcache_info_(appcache_info) {
@@ -1046,7 +1046,7 @@ void CookiesTreeModel::PopulateAppCacheInfoWithFilter(
LocalDataContainer* container,
ScopedBatchUpdateNotifier* notifier,
const base::string16& filter) {
- using appcache::AppCacheInfo;
+ using content::AppCacheInfo;
typedef std::map<GURL, std::list<AppCacheInfo> > InfoByOrigin;
CookieTreeRootNode* root = static_cast<CookieTreeRootNode*>(GetRoot());
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index 106a8fe..c0fae8f 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -111,7 +111,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
const BrowsingDataLocalStorageHelper::LocalStorageInfo*
session_storage_info);
DetailedInfo& InitAppCache(const GURL& origin,
- const appcache::AppCacheInfo* appcache_info);
+ const content::AppCacheInfo* appcache_info);
DetailedInfo& InitIndexedDB(
const content::IndexedDBInfo* indexed_db_info);
DetailedInfo& InitFileSystem(
@@ -129,7 +129,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {
const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info;
const BrowsingDataLocalStorageHelper::LocalStorageInfo*
session_storage_info;
- const appcache::AppCacheInfo* appcache_info;
+ const content::AppCacheInfo* appcache_info;
const content::IndexedDBInfo* indexed_db_info;
const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info;
const BrowsingDataQuotaHelper::QuotaInfo* quota_info;
@@ -288,7 +288,7 @@ class CookieTreeAppCacheNode : public CookieTreeNode {
// CookieTreeAppCacheNode is valid.
explicit CookieTreeAppCacheNode(
const GURL& origin_url,
- std::list<appcache::AppCacheInfo>::iterator appcache_info);
+ std::list<content::AppCacheInfo>::iterator appcache_info);
virtual ~CookieTreeAppCacheNode();
virtual void DeleteStoredObjects() OVERRIDE;
@@ -296,7 +296,7 @@ class CookieTreeAppCacheNode : public CookieTreeNode {
private:
GURL origin_url_;
- std::list<appcache::AppCacheInfo>::iterator appcache_info_;
+ std::list<content::AppCacheInfo>::iterator appcache_info_;
DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCacheNode);
};
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index f051296..b7648de 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -108,9 +108,9 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
}
void LocalDataContainer::OnAppCacheModelInfoLoaded() {
- using appcache::AppCacheInfo;
- using appcache::AppCacheInfoCollection;
- using appcache::AppCacheInfoVector;
+ using content::AppCacheInfo;
+ using content::AppCacheInfoCollection;
+ using content::AppCacheInfoVector;
typedef std::map<GURL, AppCacheInfoVector> InfoByOrigin;
scoped_refptr<AppCacheInfoCollection> appcache_info =
diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index b50dfb2..1cf4265 100644
--- a/chrome/browser/browsing_data/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -46,7 +46,7 @@ typedef std::list<BrowsingDataFileSystemHelper::FileSystemInfo>
FileSystemInfoList;
typedef std::list<BrowsingDataQuotaHelper::QuotaInfo> QuotaInfoList;
typedef net::ServerBoundCertStore::ServerBoundCertList ServerBoundCertList;
-typedef std::map<GURL, std::list<appcache::AppCacheInfo> > AppCacheInfoMap;
+typedef std::map<GURL, std::list<content::AppCacheInfo> > AppCacheInfoMap;
typedef std::vector<std::string> FlashLSODomainList;
} // namespace
diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc
index 086ffdc..84b66f2 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.cc
+++ b/chrome/browser/content_settings/local_shared_objects_container.cc
@@ -168,8 +168,8 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
for (OriginAppCacheInfoMap::const_iterator it = map.begin();
it != map.end();
++it) {
- const appcache::AppCacheInfoVector& info_vector = it->second;
- for (appcache::AppCacheInfoVector::const_iterator info =
+ const content::AppCacheInfoVector& info_vector = it->second;
+ for (content::AppCacheInfoVector::const_iterator info =
info_vector.begin();
info != info_vector.end();
++info) {
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index ae63d93..d064a5c 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -233,7 +233,7 @@ class TestResourceDispatcherHostDelegate
virtual void RequestBeginning(
net::URLRequest* request,
content::ResourceContext* resource_context,
- appcache::AppCacheService* appcache_service,
+ content::AppCacheService* appcache_service,
ResourceType::Type resource_type,
int child_id,
int route_id,
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index a46608e..1854225 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -285,7 +285,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldBeginRequest(
void ChromeResourceDispatcherHostDelegate::RequestBeginning(
net::URLRequest* request,
content::ResourceContext* resource_context,
- appcache::AppCacheService* appcache_service,
+ content::AppCacheService* appcache_service,
ResourceType::Type resource_type,
int child_id,
int route_id,
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
index bb1773f..65bd1f7 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
@@ -48,7 +48,7 @@ class ChromeResourceDispatcherHostDelegate
virtual void RequestBeginning(
net::URLRequest* request,
content::ResourceContext* resource_context,
- appcache::AppCacheService* appcache_service,
+ content::AppCacheService* appcache_service,
ResourceType::Type resource_type,
int child_id,
int route_id,
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
index 74bb514..b865298 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc
@@ -60,7 +60,7 @@ class TestDispatcherHostDelegate : public ChromeResourceDispatcherHostDelegate {
virtual void RequestBeginning(
net::URLRequest* request,
content::ResourceContext* resource_context,
- appcache::AppCacheService* appcache_service,
+ content::AppCacheService* appcache_service,
ResourceType::Type resource_type,
int child_id,
int route_id,
diff --git a/chrome/browser/renderer_host/offline_resource_throttle.cc b/chrome/browser/renderer_host/offline_resource_throttle.cc
index 272785c..41b7a80 100644
--- a/chrome/browser/renderer_host/offline_resource_throttle.cc
+++ b/chrome/browser/renderer_host/offline_resource_throttle.cc
@@ -13,6 +13,7 @@
#include "base/strings/string_util.h"
#include "chrome/browser/chromeos/offline/offline_load_page.h"
#include "chrome/browser/net/chrome_url_request_context.h"
+#include "content/public/browser/appcache_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_controller.h"
@@ -24,7 +25,6 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "url/url_constants.h"
-#include "webkit/browser/appcache/appcache_service.h"
using content::BrowserThread;
using content::RenderViewHost;
@@ -60,7 +60,7 @@ void ShowOfflinePage(
OfflineResourceThrottle::OfflineResourceThrottle(
net::URLRequest* request,
- appcache::AppCacheService* appcache_service)
+ content::AppCacheService* appcache_service)
: request_(request),
appcache_service_(appcache_service) {
DCHECK(appcache_service);
diff --git a/chrome/browser/renderer_host/offline_resource_throttle.h b/chrome/browser/renderer_host/offline_resource_throttle.h
index a78fadc..bc8cfd6e 100644
--- a/chrome/browser/renderer_host/offline_resource_throttle.h
+++ b/chrome/browser/renderer_host/offline_resource_throttle.h
@@ -13,7 +13,7 @@
#include "content/public/browser/resource_throttle.h"
#include "net/base/completion_callback.h"
-namespace appcache {
+namespace content {
class AppCacheService;
}
@@ -26,7 +26,7 @@ class OfflineResourceThrottle
public base::SupportsWeakPtr<OfflineResourceThrottle> {
public:
OfflineResourceThrottle(net::URLRequest* request,
- appcache::AppCacheService* appcache_service);
+ content::AppCacheService* appcache_service);
virtual ~OfflineResourceThrottle();
// content::ResourceThrottle implementation:
@@ -49,7 +49,7 @@ class OfflineResourceThrottle
net::URLRequest* request_;
// Safe to keep a pointer around since AppCacheService outlives all requests.
- appcache::AppCacheService* appcache_service_;
+ content::AppCacheService* appcache_service_;
net::CancelableCompletionCallback appcache_completion_callback_;
DISALLOW_COPY_AND_ASSIGN(OfflineResourceThrottle);
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h
index e76d0d1..85ad46d 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details.h
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h
@@ -8,7 +8,7 @@
#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
-#include "webkit/browser/appcache/appcache_service.h"
+#include "content/public/browser/appcache_service.h"
class CookieTreeNode;
@@ -184,7 +184,7 @@ enum CocoaCookieDetailsType {
// -initWithAppCacheInfo: creates a cookie details with the manifest URL plus
// all of this additional information that is available after an appcache is
// actually created, including its creation date, size and last accessed time.
-- (id)initWithAppCacheInfo:(const appcache::AppCacheInfo*)appcacheInfo;
+- (id)initWithAppCacheInfo:(const content::AppCacheInfo*)appcacheInfo;
// Used for local storage details in the cookie prompt dialog.
- (id)initWithLocalStorage:(const std::string&)domain
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
index 02f6f57..3ae66b3 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
@@ -11,7 +11,7 @@
#include "net/cookies/canonical_cookie.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/text/bytes_formatting.h"
-#include "webkit/browser/appcache/appcache_service.h"
+#include "content/public/browser/appcache_service.h"
#pragma mark Cocoa Cookie Details
@@ -182,7 +182,7 @@
return self;
}
-- (id)initWithAppCacheInfo:(const appcache::AppCacheInfo*)appcacheInfo {
+- (id)initWithAppCacheInfo:(const content::AppCacheInfo*)appcacheInfo {
if ((self = [super init])) {
type_ = kCocoaCookieDetailsTypeTreeAppCache;
canEditExpiration_ = NO;
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
index 3c9dc36..d227f19 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
@@ -107,7 +107,7 @@ TEST_F(CookiesDetailsTest, CreateForTreeAppCache) {
base::scoped_nsobject<CocoaCookieDetails> details;
GURL url("http://chromium.org/stuff.manifest");
- appcache::AppCacheInfo info;
+ content::AppCacheInfo info;
info.creation_time = base::Time::Now();
info.last_update_time = base::Time::Now();
info.last_access_time = base::Time::Now();
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
index 3ee3cc9..43c27eb 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -168,7 +168,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
dict->SetString(kKeyType, "app_cache");
dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
- const appcache::AppCacheInfo& appcache_info =
+ const content::AppCacheInfo& appcache_info =
*node.GetDetailedInfo().appcache_info;
dict->SetString(kKeyManifest, appcache_info.manifest_url.spec());