summaryrefslogtreecommitdiffstats
path: root/components/autofill/browser
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 19:17:16 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 19:17:16 +0000
commit901174d96b0769ad258ff42a7df7cdf6ede5c11b (patch)
treeac4c552016842a1b2aaf722737b124f48c6fa917 /components/autofill/browser
parentfee18e79ec56e01875ec2de2e4dfac17aee25906 (diff)
downloadchromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.zip
chromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.tar.gz
chromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.tar.bz2
Update components/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/15649019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill/browser')
-rw-r--r--components/autofill/browser/autocheckout_manager.cc2
-rw-r--r--components/autofill/browser/autocomplete_history_manager.cc2
-rw-r--r--components/autofill/browser/autocomplete_history_manager_unittest.cc4
-rw-r--r--components/autofill/browser/wallet/encryption_escrow_client.cc4
-rw-r--r--components/autofill/browser/wallet/wallet_client.cc4
-rw-r--r--components/autofill/browser/webdata/autofill_webdata_service.cc4
6 files changed, 10 insertions, 10 deletions
diff --git a/components/autofill/browser/autocheckout_manager.cc b/components/autofill/browser/autocheckout_manager.cc
index 223c5b6..eb0a58d 100644
--- a/components/autofill/browser/autocheckout_manager.cc
+++ b/components/autofill/browser/autocheckout_manager.cc
@@ -283,7 +283,7 @@ void AutocheckoutManager::MaybeShowAutocheckoutBubble(
scoped_refptr<net::URLRequestContextGetter>(
browser_context->GetRequestContext());
- if (!request_context)
+ if (!request_context.get())
return;
base::Closure task = base::Bind(&GetGoogleCookies, request_context, callback);
diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/browser/autocomplete_history_manager.cc
index 5d982949f..ca79889 100644
--- a/components/autofill/browser/autocomplete_history_manager.cc
+++ b/components/autofill/browser/autocomplete_history_manager.cc
@@ -170,7 +170,7 @@ void AutocompleteHistoryManager::SetExternalDelegate(
void AutocompleteHistoryManager::CancelPendingQuery() {
if (pending_query_handle_) {
- if (autofill_data_)
+ if (autofill_data_.get())
autofill_data_->CancelRequest(pending_query_handle_);
pending_query_handle_ = 0;
}
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index 3575ae2..b8b144e 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -141,7 +141,7 @@ TEST_F(AutocompleteHistoryManagerTest, CreditCardNumberValue) {
valid_cc.form_control_type = "text";
form.fields.push_back(valid_cc);
- EXPECT_CALL(*web_data_service_, AddFormFields(_)).Times(0);
+ EXPECT_CALL(*web_data_service_.get(), AddFormFields(_)).Times(0);
autocomplete_manager_->OnFormSubmitted(form);
}
@@ -184,7 +184,7 @@ TEST_F(AutocompleteHistoryManagerTest, SSNValue) {
ssn.form_control_type = "text";
form.fields.push_back(ssn);
- EXPECT_CALL(*web_data_service_, AddFormFields(_)).Times(0);
+ EXPECT_CALL(*web_data_service_.get(), AddFormFields(_)).Times(0);
autocomplete_manager_->OnFormSubmitted(form);
}
diff --git a/components/autofill/browser/wallet/encryption_escrow_client.cc b/components/autofill/browser/wallet/encryption_escrow_client.cc
index 53754a2..837949e 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client.cc
+++ b/components/autofill/browser/wallet/encryption_escrow_client.cc
@@ -45,7 +45,7 @@ EncryptionEscrowClient::EncryptionEscrowClient(
: context_getter_(context_getter),
observer_(observer),
request_type_(NO_PENDING_REQUEST) {
- DCHECK(context_getter_);
+ DCHECK(context_getter_.get());
DCHECK(observer_);
}
@@ -119,7 +119,7 @@ void EncryptionEscrowClient::MakeRequest(const GURL& url,
request_.reset(net::URLFetcher::Create(
1, url, net::URLFetcher::POST, this));
- request_->SetRequestContext(context_getter_);
+ request_->SetRequestContext(context_getter_.get());
DVLOG(1) << "url=" << url << ", post_body=" << post_body;
request_->SetUploadData(kApplicationMimeType, post_body);
request_->Start();
diff --git a/components/autofill/browser/wallet/wallet_client.cc b/components/autofill/browser/wallet/wallet_client.cc
index ace0f5d..d1c0f34 100644
--- a/components/autofill/browser/wallet/wallet_client.cc
+++ b/components/autofill/browser/wallet/wallet_client.cc
@@ -238,7 +238,7 @@ WalletClient::WalletClient(net::URLRequestContextGetter* context_getter,
request_type_(NO_PENDING_REQUEST),
one_time_pad_(kOneTimePadLength),
encryption_escrow_client_(context_getter, this) {
- DCHECK(context_getter_);
+ DCHECK(context_getter_.get());
DCHECK(delegate_);
}
@@ -632,7 +632,7 @@ void WalletClient::MakeWalletRequest(const GURL& url,
request_.reset(net::URLFetcher::Create(
0, url, net::URLFetcher::POST, this));
- request_->SetRequestContext(context_getter_);
+ request_->SetRequestContext(context_getter_.get());
DVLOG(1) << "Making request to " << url << " with post_body=" << post_body;
request_->SetUploadData(kJsonMimeType, post_body);
request_started_timestamp_ = base::Time::Now();
diff --git a/components/autofill/browser/webdata/autofill_webdata_service.cc b/components/autofill/browser/webdata/autofill_webdata_service.cc
index 51cb60d..9aada6b 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service.cc
+++ b/components/autofill/browser/webdata/autofill_webdata_service.cc
@@ -168,14 +168,14 @@ void AutofillWebDataService::RemoveOriginURLsModifiedBetween(
void AutofillWebDataService::AddObserver(
AutofillWebDataServiceObserverOnDBThread* observer) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
- if (autofill_backend_)
+ if (autofill_backend_.get())
autofill_backend_->AddObserver(observer);
}
void AutofillWebDataService::RemoveObserver(
AutofillWebDataServiceObserverOnDBThread* observer) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
- if (autofill_backend_)
+ if (autofill_backend_.get())
autofill_backend_->RemoveObserver(observer);
}