summaryrefslogtreecommitdiffstats
path: root/chrome/browser/intents
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 04:32:31 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 04:32:31 +0000
commitabc77243c735ff8b44deac96a5fc81fd9788b2c9 (patch)
tree108d9a16f4c49161bafe4758db3359aebdd832f6 /chrome/browser/intents
parent85059c375bfd167ba24b51f59fe0b5ed70a53d9b (diff)
downloadchromium_src-abc77243c735ff8b44deac96a5fc81fd9788b2c9.zip
chromium_src-abc77243c735ff8b44deac96a5fc81fd9788b2c9.tar.gz
chromium_src-abc77243c735ff8b44deac96a5fc81fd9788b2c9.tar.bz2
Profiles: Really fix refcounted services.
Previous attempts to share code between ProfileKeyedServiceFactory and RefcountedProfileKeyedServiceFactory were ill advised. The core logic code must maintain refcounted data in a scoped_refptr<> for the entire lifecycle, across interface and implementation, preventing any real abstraction here. This removes the common ProfileKeyedBase and splits the two worlds entirely in two. This has quite a bit of exact code with different types now. Fallout from this is far reaching: - Since there isn't one common heiarchy, now the testing methods either return ProfileKeyedServices or scoped_refptr<RefcountedProfileKeyedService>s. This is a lot of change. - Many consumers handled the refcounted ptrs as raw pointers, which probably isn't a good idea. - There is now a bunch of code duplication. BUG=118196,77155 R=mirandac,tim TBR=jhawkins,sky,scottbyer Review URL: http://codereview.chromium.org/9703038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/intents')
-rw-r--r--chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
index e6532ef..2743a28 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
@@ -25,7 +25,7 @@ class MockWebIntentsRegistry : public WebIntentsRegistry {
void(const webkit_glue::WebIntentServiceData&));
};
-ProfileKeyedBase* BuildMockWebIntentsRegistry(Profile* profile) {
+ProfileKeyedService* BuildMockWebIntentsRegistry(Profile* profile) {
return new MockWebIntentsRegistry;
}