diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 00:26:51 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 00:26:51 +0000 |
| commit | ce5b5805429eb63e2d76fdd4a5b79a2b62771349 (patch) | |
| tree | fd782a5a0bd7cc1506573411637271d7a9c8db4a /android_webview | |
| parent | e3e5c805da46e77138ae0193967303543b0019dc (diff) | |
| download | chromium_src-ce5b5805429eb63e2d76fdd4a5b79a2b62771349.zip chromium_src-ce5b5805429eb63e2d76fdd4a5b79a2b62771349.tar.gz chromium_src-ce5b5805429eb63e2d76fdd4a5b79a2b62771349.tar.bz2 | |
Revert 205670 "Un-refcount AutofillWebData and TokenWebData"
> Un-refcount AutofillWebData and TokenWebData
>
> depends on https://codereview.chromium.org/15927029/
>
> BUG=230920
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=205038
>
> Review URL: https://chromiumcodereview.appspot.com/16154031
TBR=caitkp@chromium.org
Review URL: https://codereview.chromium.org/16347019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_form_database_service.cc | 8 | ||||
| -rw-r--r-- | android_webview/browser/aw_form_database_service.h | 4 | ||||
| -rw-r--r-- | android_webview/native/aw_form_database.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc index 4958cb8..d08ed0e 100644 --- a/android_webview/browser/aw_form_database_service.cc +++ b/android_webview/browser/aw_form_database_service.cc @@ -34,8 +34,8 @@ AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path) l10n_util::GetDefaultLocale()))); web_database_->LoadDatabase(); - autofill_data_ .reset(new autofill::AutofillWebDataService( - web_database_, base::Bind(&DatabaseErrorCallback))); + autofill_data_ = new autofill::AutofillWebDataService( + web_database_, base::Bind(&DatabaseErrorCallback)); autofill_data_->Init(); } @@ -58,9 +58,9 @@ void AwFormDatabaseService::CancelPendingQuery() { } } -autofill::AutofillWebDataService* +scoped_refptr<autofill::AutofillWebDataService> AwFormDatabaseService::get_autofill_webdata_service() { - return autofill_data_.get(); + return autofill_data_; } void AwFormDatabaseService::ClearFormData() { diff --git a/android_webview/browser/aw_form_database_service.h b/android_webview/browser/aw_form_database_service.h index ad1af3ee..cb66d4e 100644 --- a/android_webview/browser/aw_form_database_service.h +++ b/android_webview/browser/aw_form_database_service.h @@ -33,7 +33,7 @@ class AwFormDatabaseService : public WebDataServiceConsumer { // Clear any saved form data. Executes asynchronously. void ClearFormData(); - autofill::AutofillWebDataService* + scoped_refptr<autofill::AutofillWebDataService> get_autofill_webdata_service(); // WebDataServiceConsumer implementation. @@ -52,7 +52,7 @@ class AwFormDatabaseService : public WebDataServiceConsumer { bool has_form_data_; base::WaitableEvent completion_; - scoped_ptr<autofill::AutofillWebDataService> autofill_data_; + scoped_refptr<autofill::AutofillWebDataService> autofill_data_; scoped_refptr<WebDatabaseService> web_database_; DISALLOW_COPY_AND_ASSIGN(AwFormDatabaseService); diff --git a/android_webview/native/aw_form_database.cc b/android_webview/native/aw_form_database.cc index 6979b0b..5ebdf12 100644 --- a/android_webview/native/aw_form_database.cc +++ b/android_webview/native/aw_form_database.cc @@ -14,7 +14,7 @@ #include "jni/AwFormDatabase_jni.h" // static -autofill::AutofillWebDataService* +scoped_refptr<autofill::AutofillWebDataService> autofill::AutofillWebDataService::FromBrowserContext( content::BrowserContext* context) { |