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);

[sky, 2016/07/06 15:47:38]

There is no point in OnGotCatalogEntries now. Move the implementation here. 

[yzshen1, 2016/07/06 16:50:26]

Not sure whether it matters, but please note that this is different from the
original code in that if the sync call fails (because of pipe disconnection),
OnGotCatalogEntries() stills runs. In this case, GetEntries() call will return
|false| and |entries| is untouched.

[leonhsl(Using Gerrit), 2016/07/07 07:43:12]

Moved OnGotCatalogEntries() impl here.

[leonhsl(Using Gerrit), 2016/07/07 07:43:12]

Yeah this indeed becomes different with before.. Thanks! I think we'd better
align with the original logic. Done.

   }
   ~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 19 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_;

[sky, 2016/07/06 15:47:38]

I don't think you'll need this anymore.

[leonhsl(Using Gerrit), 2016/07/07 07:43:12]

Yeah~ Done and Thanks!

 
   DISALLOW_COPY_AND_ASSIGN(CatalogViewerContents);
 };
 
 }  // namespace
 
 CatalogViewer::CatalogViewer() {}
 CatalogViewer::~CatalogViewer() {}
 
 void CatalogViewer::RemoveWindow(views::Widget* window) {
@@ skipping 37 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