Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped_array....

chrome/browser/chromeos/stub_cros_settings_provider_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/stub_cros_settings_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
 
 const Value* kTrueValue = base::Value::CreateBooleanValue(true);
 const Value* kFalseValue = base::Value::CreateBooleanValue(false);
@@ skipping 69 matching lines @@
   ExpectObservers(kReleaseChannel, 1);
 }
 
 TEST_F(StubCrosSettingsProviderTest, GetTrusted) {
   // Should return immediately without invoking the callback.
   bool trusted = provider_->GetTrusted(kDeviceOwner, base::Bind(&Fail));
   EXPECT_TRUE(trusted);
 }
 
 }  // namespace chromeos