Make use of CreateInterfacePtrAndBind() where appropriate

mojo/services/network/network_service_delegate.cc

 // Copyright 2015 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 "mojo/services/network/network_service_delegate.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 80 matching lines @@
 
 #if !defined(OS_ANDROID)
   // TODO(erg): The following doesn't work when running the android
   // apptests. It works in the mandoline shell (on desktop and on android), and
   // in the apptests on desktop. However, on android, whenever we make the call
   // to OpenFileSystem, the entire mojo system hangs to the point where writes
   // to stderr that previously would have printed to our console aren't. The
   // apptests are also fairly resistant to being run under gdb on android.
   app_->ConnectToService("mojo:filesystem", &files_);
 
-  filesystem::FileSystemClientPtr client;
-  binding_.Bind(GetProxy(&client));
-
   filesystem::FileError error = filesystem::FileError::FAILED;
   filesystem::DirectoryPtr directory;
-  files_->OpenFileSystem("origin", GetProxy(&directory), std::move(client),
-                         Capture(&error));
+  files_->OpenFileSystem("origin", GetProxy(&directory),
+                         binding_.CreateInterfacePtrAndBind(), Capture(&error));
   files_.WaitForIncomingResponse();
 
   io_worker_thread_.reset(new SQLThread(std::move(directory)));
 #endif
 
   // TODO(erg): Find everything else that writes to the filesystem and
   // transition it to proxying mojo:filesystem. We shouldn't have any path
   // calculation code here, but sadly need it until the transition is done. In
   // the mean time, manually handle the user-data-dir switch (which gets set in
   // tests) so that tests are writing to a temp dir.
@@ skipping 80 matching lines @@
     FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_,
                       OnIOWorkerThreadShutdown());
 
     // Destroy the io worker thread here so that we can commit any pending
     // cookies here.
     io_worker_thread_.reset();
   }
 }
 
 }  // namespace mojo