Revert "SERVER-13961 Add OperationContext argument to Client::Context"

This reverts commit 52edab726185cbba1401cb46de221fb3d1cb0408.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp
index cee3995395c..67bff7ef74b 100644
--- a/src/mongo/dbtests/matchertests.cpp
+++ b/src/mongo/dbtests/matchertests.cpp
@@ -41,19 +41,18 @@ namespace MatcherTests {
 
     class CollectionBase {
     public:
-        CollectionBase() : _ns( "unittests.matchertests" ) {
-
+        CollectionBase() :
+        _ns( "unittests.matchertests" ) {
         }
-
         virtual ~CollectionBase() {
-            OperationContextImpl txn;
-            DBDirectClient client(&txn);
-
-            client.dropCollection(_ns);
+            client().dropCollection( ns() );
         }
-
     protected:
+        const char* ns() const { return _ns; }
+        DBDirectClient &client() { return _client; }
+    private:
         const char * const _ns;
+        DBDirectClient _client;
     };
 
     template <typename M>