Remove a bunch of stuff in //mojo

components/leveldb/leveldb_service_unittest.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 "base/bind.h"
 #include "base/macros.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/util/capture_util.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "services/shell/public/cpp/shell_test.h"
 
 using filesystem::mojom::FileError;
-using mojo::Capture;
 
 namespace leveldb {
 namespace {
 
+template <typename T1>
+mojo::Callback<void(T1)> Capture(T1* t1) {
+  return [t1](T1 got_t1) { *t1 = std::move(got_t1); };
+}
+
+template <typename T1, typename T2>
+mojo::Callback<void(T1, T2)> Capture(T1* t1, T2* t2) {
+  return [t1, t2](T1 got_t1, T2 got_t2) {
+    *t1 = std::move(got_t1);
+    *t2 = std::move(got_t2);
+  };
+}
+
 class LevelDBServiceTest : public shell::test::ShellTest {
  public:
   LevelDBServiceTest() : ShellTest("exe:leveldb_service_unittests") {}
   ~LevelDBServiceTest() override {}
 
  protected:
   // Overridden from mojo::test::ApplicationTestBase:
   void SetUp() override {
     ShellTest::SetUp();
     connector()->ConnectToInterface("mojo:filesystem", &files_);
     connector()->ConnectToInterface("mojo:leveldb", &leveldb_);
   }
 
   void TearDown() override {
     leveldb_.reset();
     files_.reset();
     ShellTest::TearDown();
   }
 
   // Note: This has an out parameter rather than returning the |DirectoryPtr|,
   // since |ASSERT_...()| doesn't work with return values.
   void GetTempDirectory(filesystem::mojom::DirectoryPtr* directory) {
     FileError error = FileError::FAILED;
-    files()->OpenTempDirectory(GetProxy(directory), mojo::Capture(&error));
+    files()->OpenTempDirectory(GetProxy(directory), Capture(&error));
     ASSERT_TRUE(files().WaitForIncomingResponse());
     ASSERT_EQ(FileError::OK, error);
   }
 
   filesystem::mojom::FileSystemPtr& files() { return files_; }
   mojom::LevelDBServicePtr& leveldb() { return leveldb_; }
 
  private:
   filesystem::mojom::FileSystemPtr files_;
   mojom::LevelDBServicePtr leveldb_;
@@ skipping 435 matching lines @@
   key_values.SetToEmpty();
   database->GetPrefixed(mojo::Array<uint8_t>::From(prefix),
                         Capture(&error, &key_values));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(mojom::DatabaseError::OK, error);
   EXPECT_TRUE(key_values.empty());
 }
 
 }  // namespace
 }  // namespace leveldb