summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 19:41:36 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 19:41:36 +0000
commitece8a8505d789a77fae45cb0575136040018602b (patch)
tree1b8425ca47ac54ad65d23d4a45a692203163c05f /chrome
parent56f9697e2e4a4c79187f3a87f65988db51aa9528 (diff)
downloadchromium_src-ece8a8505d789a77fae45cb0575136040018602b.zip
chromium_src-ece8a8505d789a77fae45cb0575136040018602b.tar.gz
chromium_src-ece8a8505d789a77fae45cb0575136040018602b.tar.bz2
Get rid of some more dependencies on /chrome.
BUG=76788 TEST=n/a Review URL: http://codereview.chromium.org/6798004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_service_unittest.cc2
-rw-r--r--chrome/browser/profiles/profile.cc2
-rw-r--r--chrome/browser/profiles/profile_impl.cc2
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc4
4 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index b3d1028..a1a085c 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -345,7 +345,7 @@ class ExtensionTestingProfile : public TestingProfile {
NewRunnableMethod(
appcache_service_.get(),
&ChromeAppCacheService::InitializeOnIOThread,
- GetPath(), IsOffTheRecord(),
+ IsOffTheRecord() ? FilePath() : GetPath(),
make_scoped_refptr(GetHostContentSettingsMap()),
make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
false));
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 28edd4a..47fc9f8 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -241,7 +241,7 @@ class OffTheRecordProfileImpl : public Profile,
NewRunnableMethod(
appcache_service_.get(),
&ChromeAppCacheService::InitializeOnIOThread,
- GetPath(), IsOffTheRecord(),
+ IsOffTheRecord() ? FilePath() : GetPath(),
make_scoped_refptr(GetHostContentSettingsMap()),
make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
false));
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 00a1141..0726777 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -651,7 +651,7 @@ ChromeAppCacheService* ProfileImpl::GetAppCacheService() {
NewRunnableMethod(
appcache_service_.get(),
&ChromeAppCacheService::InitializeOnIOThread,
- GetPath(), IsOffTheRecord(),
+ IsOffTheRecord() ? FilePath() : GetPath(),
make_scoped_refptr(GetHostContentSettingsMap()),
make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
clear_local_state_on_exit_));
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index df9bd4f..30dcbf2 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -475,7 +475,9 @@ void BrowserRenderProcessHost::CreateMessageFilters() {
channel_->AddFilter(
new DOMStorageMessageFilter(id(), profile()->GetWebKitContext(),
profile()->GetHostContentSettingsMap()));
- channel_->AddFilter(new IndexedDBDispatcherHost(id(), profile()));
+ channel_->AddFilter(
+ new IndexedDBDispatcherHost(id(), profile()->GetWebKitContext(),
+ profile()->GetHostContentSettingsMap()));
channel_->AddFilter(
GeolocationDispatcherHost::New(
id(), profile()->GetGeolocationPermissionContext()));