Eliminate usage of InterfacePtr::WaitForIncomingResponse.

mash/catalog_viewer/catalog_viewer.cc

 // Copyright 2016 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 "mash/catalog_viewer/catalog_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
 
 class CatalogViewerContents : public views::WidgetDelegateView,
                               public ui::TableModel {
  public:
   CatalogViewerContents(CatalogViewer* catalog_viewer,
                         catalog::mojom::CatalogPtr catalog)
       : catalog_viewer_(catalog_viewer),
         catalog_(std::move(catalog)),
         table_view_(nullptr),
         table_view_parent_(nullptr),
-        observer_(nullptr),
-        weak_ptr_factory_(this) {
+        observer_(nullptr) {
     table_view_ = new views::TableView(this, GetColumns(), views::TEXT_ONLY,
                                        false);
     set_background(views::Background::CreateStandardPanelBackground());
 
     table_view_parent_ = table_view_->CreateParentIfNecessary();
     AddChildView(table_view_parent_);
 
-    catalog_->GetEntries(nullptr,
-                         base::Bind(&CatalogViewerContents::OnGotCatalogEntries,
-                                    weak_ptr_factory_.GetWeakPtr()));
     // We don't want to show an empty UI so we just block until we have all the
-    // data.
-    catalog_.WaitForIncomingResponse();
+    // data. GetEntries is a sync call.
+    mojo::Array<catalog::mojom::EntryPtr> entries;
+    bool got = catalog_->GetEntries(nullptr, &entries);
+    if (got) {
+      for (auto& entry : entries)
+        entries_.push_back(Entry(entry->display_name, entry->name));
+      observer_->OnModelChanged();
+    }
   }
   ~CatalogViewerContents() override {
     table_view_->SetModel(nullptr);
     catalog_viewer_->RemoveWindow(GetWidget());
   }
 
  private:
   struct Entry {
     Entry(const std::string& name, const std::string& url)
         : name(name), url(url) {}
@@ skipping 41 matching lines @@
     default:
       NOTREACHED();
       break;
     }
     return base::string16();
   }
   void SetObserver(ui::TableModelObserver* observer) override {
     observer_ = observer;
   }
 
-  void OnGotCatalogEntries(mojo::Array<catalog::mojom::EntryPtr> entries) {
-    entries_.clear();
-    for (auto& entry : entries)
-      entries_.push_back(Entry(entry->display_name, entry->name));
-    observer_->OnModelChanged();
-  }
-
   static std::vector<ui::TableColumn> GetColumns() {
     std::vector<ui::TableColumn> columns;
 
     ui::TableColumn name_column;
     name_column.id = 0;
     // TODO(beng): use resources.
     name_column.title = base::ASCIIToUTF16("Name");
     name_column.width = -1;
     name_column.percent = 0.4f;
     name_column.sortable = true;
@@ skipping 13 matching lines @@
 
   CatalogViewer* catalog_viewer_;
   catalog::mojom::CatalogPtr catalog_;
 
   views::TableView* table_view_;
   views::View* table_view_parent_;
   ui::TableModelObserver* observer_;
 
   std::vector<Entry> entries_;
 
-  base::WeakPtrFactory<CatalogViewerContents> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(CatalogViewerContents);
 };
 
 }  // namespace
 
 CatalogViewer::CatalogViewer() {}
 CatalogViewer::~CatalogViewer() {}
 
 void CatalogViewer::RemoveWindow(views::Widget* window) {
   auto it = std::find(windows_.begin(), windows_.end(), window);
@@ skipping 36 matching lines @@
   windows_.push_back(window);
 }
 
 void CatalogViewer::Create(shell::Connection* connection,
                            mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace catalog_viewer
 }  // namespace mash