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 32 matching lines @@
         table_view_parent_(nullptr),
         observer_(nullptr),
         weak_ptr_factory_(this) {
     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;
+    catalog_->GetEntries(nullptr, &entries);
+
+    OnGotCatalogEntries(entries);
   }
   ~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) {
+  void OnGotCatalogEntries(
+      const 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;
@@ skipping 77 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