Revert synchronous FIDL callers to use SyncPtr rather than Sync2Ptr.

Sync2Ptr was a temporary type, used during migration of SyncPtr APIs
from returning |bool| to |zx_status_t|, to remove risk of implicit
conversions to |bool|.

Some libzx call-sites (e.g. use of zx::process::self()) are also
updated to be compatible with changes in the latest Fuchsia SDK.

TBR: dcheng, jochen
Change-Id: I9e9350931e18f2bddc0ef7234d225821cf7d22f1
Reviewed-on: https://chromium-review.googlesource.com/1141659
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576017}

base/fuchsia/component_context.h

@@ -18,7 +18,7 @@ template <typename Interface>
 class InterfacePtr;
 
 template <typename Interface>
-class Synchronous2InterfacePtr;
+class SynchronousInterfacePtr;
 
 }  // namespace fidl
 
@@ -49,8 +49,8 @@ class BASE_EXPORT ComponentContext {
   // Connects to an environment service and returns synchronous interface
   // implementation.
   template <typename Interface>
-  fidl::Synchronous2InterfacePtr<Interface> ConnectToServiceSync() {
-    fidl::Synchronous2InterfacePtr<Interface> result;
+  fidl::SynchronousInterfacePtr<Interface> ConnectToServiceSync() {
+    fidl::SynchronousInterfacePtr<Interface> result;
     ConnectToService(FidlInterfaceRequest(&result));
     return result;
   }

base/fuchsia/fidl_interface_request.h

@@ -20,7 +20,7 @@ template <typename Interface>
 class InterfacePtr;
 
 template <typename Interface>
-class Synchronous2InterfacePtr;
+class SynchronousInterfacePtr;
 
 }  // namespace fidl
 
@@ -46,7 +46,7 @@ class BASE_EXPORT FidlInterfaceRequest {
       : FidlInterfaceRequest(stub->NewRequest()) {}
 
   template <typename Interface>
-  explicit FidlInterfaceRequest(fidl::Synchronous2InterfacePtr<Interface>* stub)
+  explicit FidlInterfaceRequest(fidl::SynchronousInterfacePtr<Interface>* stub)
       : FidlInterfaceRequest(stub->NewRequest()) {}
 
   FidlInterfaceRequest(FidlInterfaceRequest&&);

base/logging_unittest.cc

@@ -325,8 +325,8 @@ void* CrashThread(void* arg) {
   int death_location = data->death_location;
 
   // Register the exception handler on the port.
-  status =
-      zx::thread::self().bind_exception_port(*data->port, kExceptionPortKey, 0);
+  status = zx::thread::self()->bind_exception_port(*data->port,
+                                                   kExceptionPortKey, 0);
   if (status != ZX_OK) {
     data->event->signal(0, ZX_USER_SIGNAL_0);
     return nullptr;
@@ -374,8 +374,8 @@ void SpawnCrashThread(int death_location, uintptr_t* child_crash_addr) {
 
   // Get the crash address.
   zx::thread zircon_thread;
-  status = zx::process::self().get_child(packet.exception.tid,
-                                         ZX_RIGHT_SAME_RIGHTS, &zircon_thread);
+  status = zx::process::self()->get_child(packet.exception.tid,
+                                          ZX_RIGHT_SAME_RIGHTS, &zircon_thread);
   ASSERT_EQ(status, ZX_OK);
   zx_thread_state_general_regs_t buffer;
   status = zircon_thread.read_state(ZX_THREAD_STATE_GENERAL_REGS, &buffer,

base/memory/shared_memory_fuchsia.cc

@@ -88,7 +88,7 @@ bool SharedMemory::MapAt(off_t offset, size_t bytes) {
   if (!read_only_)
     flags |= ZX_VM_FLAG_PERM_WRITE;
   uintptr_t addr;
-  zx_status_t status = zx::vmar::root_self().map(
+  zx_status_t status = zx::vmar::root_self()->map(
       0, *zx::unowned_vmo(shm_.GetHandle()), offset, bytes, flags, &addr);
   if (status != ZX_OK) {
     ZX_DLOG(ERROR, status) << "zx_vmar_map";
@@ -109,7 +109,7 @@ bool SharedMemory::Unmap() {
   SharedMemoryTracker::GetInstance()->DecrementMemoryUsage(*this);
 
   uintptr_t addr = reinterpret_cast<uintptr_t>(memory_);
-  zx_status_t status = zx::vmar::root_self().unmap(addr, mapped_size_);
+  zx_status_t status = zx::vmar::root_self()->unmap(addr, mapped_size_);
   if (status != ZX_OK) {
     ZX_DLOG(ERROR, status) << "zx_vmar_unmap";
     return false;

base/memory/shared_memory_unittest.cc

@@ -417,7 +417,7 @@ TEST_P(SharedMemoryTest, GetReadOnlyHandle) {
   (void)handle;
 #elif defined(OS_FUCHSIA)
   uintptr_t addr;
-  EXPECT_NE(ZX_OK, zx::vmar::root_self().map(
+  EXPECT_NE(ZX_OK, zx::vmar::root_self()->map(
                        0, *zx::unowned_vmo(handle.GetHandle()), 0,
                        contents.size(), ZX_VM_FLAG_PERM_WRITE, &addr))
       << "Shouldn't be able to map as writable.";

net/base/network_interfaces_fuchsia.cc

@@ -99,15 +99,15 @@ std::vector<NetworkInterface> NetInterfaceToNetworkInterfaces(
 bool GetNetworkList(NetworkInterfaceList* networks, int policy) {
   DCHECK(networks);
 
-  fuchsia::netstack::NetstackSync2Ptr netstack =
+  fuchsia::netstack::NetstackSyncPtr netstack =
       base::fuchsia::ComponentContext::GetDefault()
           ->ConnectToServiceSync<fuchsia::netstack::Netstack>();
 
   // TODO(kmarshall): Use NetworkChangeNotifier's cached interface list.
   fidl::VectorPtr<fuchsia::netstack::NetInterface> interfaces;
-  auto status = netstack->GetInterfaces(&interfaces);
-  if (status.statvs != ZX_OK) {
-    ZX_LOG(ERROR, status.statvs) << "fuchsia::netstack::GetInterfaces()";
+  zx_status_t status = netstack->GetInterfaces(&interfaces);
+  if (status != ZX_OK) {
+    ZX_LOG(ERROR, status) << "fuchsia::netstack::GetInterfaces()";
     return false;
   }
 

skia/ext/fontmgr_fuchsia.cc

@@ -204,7 +204,7 @@ void FuchsiaFontManager::FontCache::OnTypefaceDeleted(zx_koid_t vmo_koid) {
 }
 
 FuchsiaFontManager::FuchsiaFontManager(
-    fuchsia::fonts::FontProviderSync2Ptr font_provider)
+    fuchsia::fonts::FontProviderSyncPtr font_provider)
     : font_provider_(std::move(font_provider)), font_cache_(new FontCache()) {
   for (auto& m : kFontMap) {
     font_map_[m.font_name_in] = m.font_name_out;
@@ -254,9 +254,9 @@ SkTypeface* FuchsiaFontManager::onMatchFamilyStyle(
   request.slant = ToFontSlant(style.slant());
 
   fuchsia::fonts::FontResponsePtr response;
-  auto status = font_provider_->GetFont(std::move(request), &response);
-  if (status.statvs != ZX_OK) {
-    ZX_DLOG(ERROR, status.statvs) << "Failed to query font provider.";
+  zx_status_t status = font_provider_->GetFont(std::move(request), &response);
+  if (status != ZX_OK) {
+    ZX_DLOG(ERROR, status) << "Failed to query font provider.";
   } else if (response) {
     sk_sp<SkTypeface> result =
         font_cache_->GetTypefaceFromFontData(std::move(response->data));

skia/ext/fontmgr_fuchsia.h

@@ -20,7 +20,7 @@ namespace skia {
 class SK_API FuchsiaFontManager : public SkFontMgr {
  public:
   explicit FuchsiaFontManager(
-      fuchsia::fonts::FontProviderSync2Ptr font_provider);
+      fuchsia::fonts::FontProviderSyncPtr font_provider);
 
   ~FuchsiaFontManager() override;
 
@@ -52,7 +52,7 @@ class SK_API FuchsiaFontManager : public SkFontMgr {
  private:
   class FontCache;
 
-  fuchsia::fonts::FontProviderSync2Ptr font_provider_;
+  fuchsia::fonts::FontProviderSyncPtr font_provider_;
 
   // Map applied to font family name before sending requests to the FontService.
   base::flat_map<std::string, std::string> font_map_;

skia/ext/fontmgr_fuchsia_unittest.cc

@@ -115,7 +115,7 @@ class MockFontProviderService {
 class FuchsiaFontManagerTest : public testing::Test {
  public:
   FuchsiaFontManagerTest() {
-    fuchsia::fonts::FontProviderSync2Ptr font_provider;
+    fuchsia::fonts::FontProviderSyncPtr font_provider;
     font_provider_service_.Bind(font_provider.NewRequest());
     font_manager_ = sk_make_sp<FuchsiaFontManager>(std::move(font_provider));
   }
@@ -160,4 +160,4 @@ TEST_F(FuchsiaFontManagerTest, ReleaseThenCreateAgain) {
   EXPECT_TRUE(serif2);
 }
 
-}  // namespace skia
+}  // namespace skia
\ No newline at end of file