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

This reverts commit e1f5a39b1b625d04752be13f39c774e579b64cd8.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/mongo/dbtests/plan_ranking.cpp b/src/mongo/dbtests/plan_ranking.cpp
index 79419bb60fa..240371f1482 100644
--- a/src/mongo/dbtests/plan_ranking.cpp
+++ b/src/mongo/dbtests/plan_ranking.cpp
@@ -60,10 +60,7 @@ namespace PlanRankingTests {
 
     class PlanRankingTestBase {
     public:
-        PlanRankingTestBase()
-            : _internalQueryForceIntersectionPlans(internalQueryForceIntersectionPlans),
-              _client(&_txn) {
-
+        PlanRankingTestBase() : _internalQueryForceIntersectionPlans(internalQueryForceIntersectionPlans) {
             Client::WriteContext ctx(&_txn, ns);
             _client.dropCollection(ns);
         }
@@ -143,13 +140,12 @@ namespace PlanRankingTests {
         OperationContextImpl _txn;
 
     private:
+
+        DBDirectClient _client;
+        scoped_ptr<MultiPlanStage> _mps;
         // Holds the value of global "internalQueryForceIntersectionPlans" setParameter flag.
         // Restored at end of test invocation regardless of test result.
         bool _internalQueryForceIntersectionPlans;
-
-        scoped_ptr<MultiPlanStage> _mps;
-
-        DBDirectClient _client;
     };
 
     // static