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

content/child/indexed_db/proxy_webidbdatabase_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/indexed_db/proxy_webidbdatabase_impl.h"
 
 #include <vector>
 
 #include "content/child/thread_safe_sender.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
@@ skipping 24 matching lines @@
 }
 
 RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   // It's not possible for there to be pending callbacks that address this
   // object since inside WebKit, they hold a reference to the object which owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseDestroyed(
       ipc_database_id_));
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->DatabaseDestroyed(ipc_database_id_);
 }
 
 void RendererWebIDBDatabaseImpl::createObjectStore(
     long long transaction_id,
     long long object_store_id,
     const WebKit::WebString& name,
     const WebKit::WebIDBKeyPath& key_path,
     bool auto_increment) {
   IndexedDBHostMsg_DatabaseCreateObjectStore_Params params;
@@ skipping 18 matching lines @@
           object_store_id));
 }
 
 void RendererWebIDBDatabaseImpl::createTransaction(
     long long transaction_id,
     WebKit::WebIDBDatabaseCallbacks* callbacks,
     const WebVector<long long>& object_store_ids,
     unsigned short mode)
 {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseCreateTransaction(ipc_database_id_,
-                                                  transaction_id,
-                                                  callbacks,
-                                                  object_store_ids,
-                                                  mode);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseCreateTransaction(
+      ipc_database_id_, transaction_id, callbacks, object_store_ids, mode);
 }
 
 void RendererWebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseClose(ipc_database_id_,
                                       ipc_database_callbacks_id_);
 }
 
 void RendererWebIDBDatabaseImpl::get(
     long long transaction_id,
     long long object_store_id,
     long long index_id,
     const WebKit::WebIDBKeyRange& key_range,
     bool key_only,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseGet(
-      ipc_database_id_, transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), key_only, callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseGet(ipc_database_id_,
+                                    transaction_id,
+                                    object_store_id,
+                                    index_id,
+                                    IndexedDBKeyRange(key_range),
+                                    key_only,
+                                    callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::put(
     long long transaction_id,
     long long object_store_id,
     const WebKit::WebData& value,
     const WebKit::WebIDBKey& key,
     PutMode put_mode,
     WebIDBCallbacks* callbacks,
     const WebVector<long long>& web_index_ids,
     const WebVector<WebIndexKeys>& web_index_keys) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabasePut(
-      ipc_database_id_, transaction_id, object_store_id,
-      value, IndexedDBKey(key), put_mode, callbacks,
-      web_index_ids, web_index_keys);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabasePut(ipc_database_id_,
+                                    transaction_id,
+                                    object_store_id,
+                                    value,
+                                    IndexedDBKey(key),
+                                    put_mode,
+                                    callbacks,
+                                    web_index_ids,
+                                    web_index_keys);
 }
 
 void RendererWebIDBDatabaseImpl::setIndexKeys(
     long long transaction_id,
     long long object_store_id,
     const WebKit::WebIDBKey& primary_key,
     const WebVector<long long>& index_ids,
     const WebVector<WebIndexKeys>& index_keys) {
   IndexedDBHostMsg_DatabaseSetIndexKeys_Params params;
   params.ipc_database_id = ipc_database_id_;
@@ skipping 29 matching lines @@
 void RendererWebIDBDatabaseImpl::openCursor(
     long long transaction_id,
     long long object_store_id,
     long long index_id,
     const WebKit::WebIDBKeyRange& key_range,
     unsigned short direction,
     bool key_only,
     TaskType task_type,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseOpenCursor(
-      ipc_database_id_,
-      transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), direction, key_only, task_type, callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseOpenCursor(ipc_database_id_,
+                                           transaction_id,
+                                           object_store_id,
+                                           index_id,
+                                           IndexedDBKeyRange(key_range),
+                                           direction,
+                                           key_only,
+                                           task_type,
+                                           callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::count(
     long long transaction_id,
     long long object_store_id,
     long long index_id,
     const WebKit::WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseCount(
-      ipc_database_id_,
-      transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseCount(ipc_database_id_,
+                                      transaction_id,
+                                      object_store_id,
+                                      index_id,
+                                      IndexedDBKeyRange(key_range),
+                                      callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::deleteRange(
     long long transaction_id,
     long long object_store_id,
     const WebKit::WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseDeleteRange(
-      ipc_database_id_,
-      transaction_id, object_store_id,
-      IndexedDBKeyRange(key_range), callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseDeleteRange(ipc_database_id_,
+                                            transaction_id,
+                                            object_store_id,
+                                            IndexedDBKeyRange(key_range),
+                                            callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::clear(
     long long transaction_id,
     long long object_store_id,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseClear(
-      ipc_database_id_,
-      transaction_id, object_store_id, callbacks);
+      ipc_database_id_, transaction_id, object_store_id, callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::createIndex(
     long long transaction_id,
     long long object_store_id,
     long long index_id,
     const WebString& name,
     const WebIDBKeyPath& key_path,
     bool unique,
     bool multi_entry)
@@ skipping 28 matching lines @@
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseAbort(
       ipc_database_id_, transaction_id));
 }
 
 void RendererWebIDBDatabaseImpl::commit(long long transaction_id) {
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseCommit(
       ipc_database_id_, transaction_id));
 }
 
 }  // namespace content