More base::Values-related bare pointer -> scoped_ptr conversions

chrome/test/chromedriver/commands_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 342 matching lines @@
           element2.SetString("ELEMENT", "2");
           base::ListValue list;
           list.Append(element1.DeepCopy());
           list.Append(element2.DeepCopy());
           result_.reset(list.DeepCopy());
         }
         break;
       }
       case kElementNotExistsQueryOnce: {
         if (only_one_)
-          result_.reset(base::Value::CreateNullValue());
+          result_ = base::Value::CreateNullValue();
         else
           result_.reset(new base::ListValue());
         break;
       }
     }
   }
   ~FindElementWebView() override {}
 
   void Verify(const std::string& expected_frame,
               const base::ListValue* expected_args,
@@ skipping 14 matching lines @@
   // Overridden from WebView:
   Status CallFunction(const std::string& frame,
                       const std::string& function,
                       const base::ListValue& args,
                       scoped_ptr<base::Value>* result) override {
     ++current_count_;
     if (scenario_ == kElementExistsTimeout ||
         (scenario_ == kElementExistsQueryTwice && current_count_ == 1)) {
         // Always return empty result when testing timeout.
         if (only_one_)
-          result->reset(base::Value::CreateNullValue());
+          *result = base::Value::CreateNullValue();
         else
           result->reset(new base::ListValue());
     } else {
       switch (scenario_) {
         case kElementExistsQueryOnce:
         case kElementNotExistsQueryOnce: {
           EXPECT_EQ(1, current_count_);
           break;
         }
         case kElementExistsQueryTwice: {
           EXPECT_EQ(2, current_count_);
           break;
         }
         default: {
           break;
         }
       }
 
-      result->reset(result_->DeepCopy());
+      *result = result_->CreateDeepCopy();
       frame_ = frame;
       function_ = function;
-      args_.reset(args.DeepCopy());
+      args_ = args.CreateDeepCopy();
     }
     return Status(kOk);
   }
 
  private:
   bool only_one_;
   TestScenario scenario_;
   int current_count_;
   std::string frame_;
   std::string function_;
@@ skipping 384 matching lines @@
       false,
       params,
       id,
       base::Bind(&OnFailBecauseErrorNotifyingListeners, &run_loop));
   run_loop.Run();
 
   thread->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&VerifySessionWasDeleted));
 }