Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*"

Android fixes and post-Linux cleanup

BUG=110610
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/16907002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206179 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 19 insertions, 16 deletions

diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 8f0f214..ea98457 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -61,7 +61,7 @@ AwBrowserContext* AwBrowserContext::FromWebContents(
 }
 
 void AwBrowserContext::InitializeBeforeThreadCreation() {
-  DCHECK(!url_request_context_getter_);
+  DCHECK(!url_request_context_getter_.get());
   url_request_context_getter_ = new AwURLRequestContextGetter(this);
 }
 
@@ -78,7 +78,7 @@ void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
 
 net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers) {
-  CHECK(url_request_context_getter_);
+  CHECK(url_request_context_getter_.get());
   url_request_context_getter_->SetProtocolHandlers(protocol_handlers);
   return url_request_context_getter_.get();
 }
@@ -88,7 +88,7 @@ AwBrowserContext::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory,
     content::ProtocolHandlerMap* protocol_handlers) {
-  CHECK(url_request_context_getter_);
+  CHECK(url_request_context_getter_.get());
   return url_request_context_getter_.get();
 }
 
@@ -159,9 +159,9 @@ AwBrowserContext::GetMediaRequestContextForStoragePartition(
 
 content::ResourceContext* AwBrowserContext::GetResourceContext() {
   if (!resource_context_) {
-    CHECK(url_request_context_getter_);
-    resource_context_.reset(new AwResourceContext(
-        url_request_context_getter_.get()));
+    CHECK(url_request_context_getter_.get());
+    resource_context_.reset(
+        new AwResourceContext(url_request_context_getter_.get()));
   }
   return resource_context_.get();
 }
@@ -173,11 +173,11 @@ AwBrowserContext::GetDownloadManagerDelegate() {
 
 content::GeolocationPermissionContext*
 AwBrowserContext::GetGeolocationPermissionContext() {
-  if (!geolocation_permission_context_) {
+  if (!geolocation_permission_context_.get()) {
     geolocation_permission_context_ =
         native_factory_->CreateGeolocationPermission(this);
   }
-  return geolocation_permission_context_;
+  return geolocation_permission_context_.get();
 }
 
 content::SpeechRecognitionPreferences*
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 1cf2d6b..d41eccc 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -257,8 +257,11 @@ void AwContentBrowserClient::AllowCertificateError(
       AwContentsClientBridgeBase::FromID(render_process_id, render_view_id);
   bool cancel_request = true;
   if (client)
-    client->AllowCertificateError(cert_error, ssl_info.cert, request_url,
-                                  callback, &cancel_request);
+    client->AllowCertificateError(cert_error,
+                                  ssl_info.cert.get(),
+                                  request_url,
+                                  callback,
+                                  &cancel_request);
   if (cancel_request)
     *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
 }
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc
index d08ed0e..72b8b91 100644
--- a/android_webview/browser/aw_form_database_service.cc
+++ b/android_webview/browser/aw_form_database_service.cc
@@ -52,7 +52,7 @@ void AwFormDatabaseService::Shutdown() {
 
 void AwFormDatabaseService::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/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
index c2ea5a4..2c73253 100644
--- a/android_webview/browser/aw_login_delegate.cc
+++ b/android_webview/browser/aw_login_delegate.cc
@@ -85,7 +85,7 @@ void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create(
-      this, auth_info_, first_auth_attempt));
+      this, auth_info_.get(), first_auth_attempt));
 
   RenderViewHost* render_view_host = RenderViewHost::FromID(
       render_process_id_, render_view_id_);
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc
index ae586b8..0dc6596 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc
@@ -181,7 +181,7 @@ void AndroidStreamReaderURLRequestJob::OnInputStreamOpened(
       CreateStreamReader(input_stream.get()));
   DCHECK(input_stream_reader);
 
-  DCHECK(!input_stream_reader_wrapper_);
+  DCHECK(!input_stream_reader_wrapper_.get());
   input_stream_reader_wrapper_ = new InputStreamReaderWrapper(
       input_stream.Pass(), input_stream_reader.Pass());
 
@@ -236,7 +236,7 @@ bool AndroidStreamReaderURLRequestJob::ReadRawData(net::IOBuffer* dest,
                                                    int dest_size,
                                                    int* bytes_read) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (!input_stream_reader_wrapper_) {
+  if (!input_stream_reader_wrapper_.get()) {
     // This will happen if opening the InputStream fails in which case the
     // error is communicated by setting the HTTP response status header rather
     // than failing the request during the header fetch phase.
@@ -265,7 +265,7 @@ bool AndroidStreamReaderURLRequestJob::GetMimeType(
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
-  if (!input_stream_reader_wrapper_)
+  if (!input_stream_reader_wrapper_.get())
     return false;
 
   // Since it's possible for this call to alter the InputStream a
@@ -281,7 +281,7 @@ bool AndroidStreamReaderURLRequestJob::GetCharset(std::string* charset) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
-  if (!input_stream_reader_wrapper_)
+  if (!input_stream_reader_wrapper_.get())
     return false;
 
   // Since it's possible for this call to alter the InputStream a