summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
Diffstat (limited to 'net/base')
-rw-r--r--net/base/address_list.cc6
-rw-r--r--net/base/backoff_entry_serializer.cc4
-rw-r--r--net/base/directory_lister.cc9
-rw-r--r--net/base/file_stream.cc5
-rw-r--r--net/base/file_stream_context.cc8
-rw-r--r--net/base/file_stream_context_posix.cc6
-rw-r--r--net/base/file_stream_unittest.cc10
-rw-r--r--net/base/keygen_handler_nss.cc6
-rw-r--r--net/base/keygen_handler_unittest.cc9
-rw-r--r--net/base/layered_network_delegate.cc5
-rw-r--r--net/base/layered_network_delegate_unittest.cc9
-rw-r--r--net/base/mock_file_stream.cc7
-rw-r--r--net/base/network_quality_estimator.cc5
-rw-r--r--net/base/network_quality_estimator_unittest.cc12
-rw-r--r--net/base/sdch_manager.cc24
-rw-r--r--net/base/sdch_manager_unittest.cc4
-rw-r--r--net/base/sdch_net_log_params.cc6
17 files changed, 76 insertions, 59 deletions
diff --git a/net/base/address_list.cc b/net/base/address_list.cc
index e030878..5b4fe34 100644
--- a/net/base/address_list.cc
+++ b/net/base/address_list.cc
@@ -4,6 +4,8 @@
#include "net/base/address_list.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/values.h"
@@ -25,8 +27,8 @@ scoped_ptr<base::Value> NetLogAddressListCallback(
list->Append(new base::StringValue(it->ToString()));
}
- dict->Set("address_list", list.Pass());
- return dict.Pass();
+ dict->Set("address_list", std::move(list));
+ return std::move(dict);
}
} // namespace
diff --git a/net/base/backoff_entry_serializer.cc b/net/base/backoff_entry_serializer.cc
index 1467553..e736685 100644
--- a/net/base/backoff_entry_serializer.cc
+++ b/net/base/backoff_entry_serializer.cc
@@ -4,6 +4,8 @@
#include "net/base/backoff_entry_serializer.h"
+#include <utility>
+
#include "base/strings/string_number_conversions.h"
#include "base/time/tick_clock.h"
#include "base/values.h"
@@ -34,7 +36,7 @@ scoped_ptr<base::Value> BackoffEntrySerializer::SerializeToValue(
serialized->AppendString(
base::Int64ToString(absolute_release_time.ToInternalValue()));
- return serialized.Pass();
+ return std::move(serialized);
}
scoped_ptr<BackoffEntry> BackoffEntrySerializer::DeserializeFromValue(
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index efdc53c..6b06ca6 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -5,6 +5,7 @@
#include "net/base/directory_lister.h"
#include <algorithm>
+#include <utility>
#include "base/bind.h"
#include "base/files/file_enumerator.h"
@@ -121,9 +122,9 @@ void DirectoryLister::Core::Start() {
if (!base::DirectoryExists(dir_)) {
origin_task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&Core::DoneOnOriginThread, this,
- base::Passed(directory_list.Pass()), ERR_FILE_NOT_FOUND));
+ FROM_HERE, base::Bind(&Core::DoneOnOriginThread, this,
+ base::Passed(std::move(directory_list)),
+ ERR_FILE_NOT_FOUND));
return;
}
@@ -169,7 +170,7 @@ void DirectoryLister::Core::Start() {
origin_task_runner_->PostTask(
FROM_HERE, base::Bind(&Core::DoneOnOriginThread, this,
- base::Passed(directory_list.Pass()), OK));
+ base::Passed(std::move(directory_list)), OK));
}
bool DirectoryLister::Core::IsCancelled() const {
diff --git a/net/base/file_stream.cc b/net/base/file_stream.cc
index 81e14ae..6826e80 100644
--- a/net/base/file_stream.cc
+++ b/net/base/file_stream.cc
@@ -4,6 +4,8 @@
#include "net/base/file_stream.h"
+#include <utility>
+
#include "base/profiler/scoped_tracker.h"
#include "net/base/file_stream_context.h"
#include "net/base/net_errors.h"
@@ -16,8 +18,7 @@ FileStream::FileStream(const scoped_refptr<base::TaskRunner>& task_runner)
FileStream::FileStream(base::File file,
const scoped_refptr<base::TaskRunner>& task_runner)
- : context_(new Context(file.Pass(), task_runner)) {
-}
+ : context_(new Context(std::move(file), task_runner)) {}
FileStream::~FileStream() {
context_.release()->Orphan();
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
index 6d77d6d..7da28a9 100644
--- a/net/base/file_stream_context.cc
+++ b/net/base/file_stream_context.cc
@@ -52,9 +52,7 @@ FileStream::Context::OpenResult::OpenResult() {
FileStream::Context::OpenResult::OpenResult(base::File file,
IOResult error_code)
- : file(file.Pass()),
- error_code(error_code) {
-}
+ : file(std::move(file)), error_code(error_code) {}
FileStream::Context::OpenResult::OpenResult(OpenResult&& other)
: file(std::move(other.file)), error_code(other.error_code) {}
@@ -174,7 +172,7 @@ FileStream::Context::OpenResult FileStream::Context::OpenFileImpl(
return OpenResult(base::File(),
IOResult::FromOSError(logging::GetLastSystemErrorCode()));
- return OpenResult(file.Pass(), IOResult(OK, 0));
+ return OpenResult(std::move(file), IOResult(OK, 0));
}
FileStream::Context::IOResult FileStream::Context::CloseFileImpl() {
@@ -191,7 +189,7 @@ FileStream::Context::IOResult FileStream::Context::FlushFileImpl() {
void FileStream::Context::OnOpenCompleted(const CompletionCallback& callback,
OpenResult open_result) {
- file_ = open_result.file.Pass();
+ file_ = std::move(open_result.file);
if (file_.IsValid() && !orphaned_)
OnFileOpened();
diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc
index f84b7df..af98c78 100644
--- a/net/base/file_stream_context_posix.cc
+++ b/net/base/file_stream_context_posix.cc
@@ -5,6 +5,7 @@
#include "net/base/file_stream_context.h"
#include <errno.h>
+#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -29,11 +30,10 @@ FileStream::Context::Context(const scoped_refptr<base::TaskRunner>& task_runner)
FileStream::Context::Context(base::File file,
const scoped_refptr<base::TaskRunner>& task_runner)
- : file_(file.Pass()),
+ : file_(std::move(file)),
async_in_progress_(false),
orphaned_(false),
- task_runner_(task_runner) {
-}
+ task_runner_(task_runner) {}
FileStream::Context::~Context() {
}
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index 4304668..a67a91c 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -4,6 +4,8 @@
#include "net/base/file_stream.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file.h"
@@ -117,7 +119,7 @@ TEST_F(FileStreamTest, UseFileHandle) {
// Seek to the beginning of the file and read.
scoped_ptr<FileStream> read_stream(
- new FileStream(file.Pass(), base::ThreadTaskRunnerHandle::Get()));
+ new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
ASSERT_EQ(ERR_IO_PENDING, read_stream->Seek(0, callback64.callback()));
ASSERT_EQ(0, callback64.WaitForResult());
// Read into buffer and compare.
@@ -135,7 +137,7 @@ TEST_F(FileStreamTest, UseFileHandle) {
file.Initialize(temp_file_path(), flags);
scoped_ptr<FileStream> write_stream(
- new FileStream(file.Pass(), base::ThreadTaskRunnerHandle::Get()));
+ new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
ASSERT_EQ(ERR_IO_PENDING, write_stream->Seek(0, callback64.callback()));
ASSERT_EQ(0, callback64.WaitForResult());
scoped_refptr<IOBufferWithSize> write_buffer = CreateTestDataBuffer();
@@ -752,7 +754,7 @@ TEST_F(FileStreamTest, WriteError) {
ASSERT_TRUE(file.IsValid());
scoped_ptr<FileStream> stream(
- new FileStream(file.Pass(), base::ThreadTaskRunnerHandle::Get()));
+ new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
scoped_refptr<IOBuffer> buf = new IOBuffer(1);
buf->data()[0] = 0;
@@ -777,7 +779,7 @@ TEST_F(FileStreamTest, ReadError) {
ASSERT_TRUE(file.IsValid());
scoped_ptr<FileStream> stream(
- new FileStream(file.Pass(), base::ThreadTaskRunnerHandle::Get()));
+ new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
scoped_refptr<IOBuffer> buf = new IOBuffer(1);
TestCompletionCallback callback;
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index 661dabc..849f787 100644
--- a/net/base/keygen_handler_nss.cc
+++ b/net/base/keygen_handler_nss.cc
@@ -4,6 +4,8 @@
#include "net/base/keygen_handler.h"
+#include <utility>
+
#include "base/logging.h"
#include "crypto/nss_crypto_module_delegate.h"
#include "crypto/nss_util.h"
@@ -20,7 +22,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
crypto::ScopedPK11Slot slot;
if (crypto_module_delegate_) {
- slot = crypto_module_delegate_->RequestSlot().Pass();
+ slot = crypto_module_delegate_->RequestSlot();
} else {
LOG(ERROR) << "Could not get an NSS key slot.";
return std::string();
@@ -40,7 +42,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
void KeygenHandler::set_crypto_module_delegate(
scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate) {
- crypto_module_delegate_ = delegate.Pass();
+ crypto_module_delegate_ = std::move(delegate);
}
} // namespace net
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index 74d9146..c1b5fe4 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -5,14 +5,15 @@
#include "net/base/keygen_handler.h"
#include <string>
+#include <utility>
#include "base/base64.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/threading/worker_pool.h"
-#include "base/threading/thread_restrictions.h"
#include "base/synchronization/waitable_event.h"
+#include "base/threading/thread_restrictions.h"
+#include "base/threading/worker_pool.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,7 +31,7 @@ namespace {
class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
public:
explicit StubCryptoModuleDelegate(crypto::ScopedPK11Slot slot)
- : slot_(slot.Pass()) {}
+ : slot_(std::move(slot)) {}
std::string RequestPassword(const std::string& slot_name,
bool retry,
@@ -61,7 +62,7 @@ class KeygenHandlerTest : public ::testing::Test {
new StubCryptoModuleDelegate(crypto::ScopedPK11Slot(
PK11_ReferenceSlot(test_nss_db_.slot())))));
#endif
- return handler.Pass();
+ return handler;
}
private:
diff --git a/net/base/layered_network_delegate.cc b/net/base/layered_network_delegate.cc
index 265fa42..9fe3719 100644
--- a/net/base/layered_network_delegate.cc
+++ b/net/base/layered_network_delegate.cc
@@ -4,12 +4,13 @@
#include "net/base/layered_network_delegate.h"
+#include <utility>
+
namespace net {
LayeredNetworkDelegate::LayeredNetworkDelegate(
scoped_ptr<NetworkDelegate> nested_network_delegate)
- : nested_network_delegate_(nested_network_delegate.Pass()) {
-}
+ : nested_network_delegate_(std::move(nested_network_delegate)) {}
LayeredNetworkDelegate::~LayeredNetworkDelegate() {
}
diff --git a/net/base/layered_network_delegate_unittest.cc b/net/base/layered_network_delegate_unittest.cc
index fb427a4..6ca77a5 100644
--- a/net/base/layered_network_delegate_unittest.cc
+++ b/net/base/layered_network_delegate_unittest.cc
@@ -5,6 +5,7 @@
#include "net/base/layered_network_delegate.h"
#include <map>
+#include <utility>
#include "base/bind.h"
#include "base/files/file_path.h"
@@ -174,7 +175,7 @@ class TestLayeredNetworkDelegate : public LayeredNetworkDelegate {
public:
TestLayeredNetworkDelegate(scoped_ptr<NetworkDelegate> network_delegate,
CountersMap* counters)
- : LayeredNetworkDelegate(network_delegate.Pass()),
+ : LayeredNetworkDelegate(std::move(network_delegate)),
context_(true),
counters_(counters) {
context_.Init();
@@ -373,9 +374,9 @@ class LayeredNetworkDelegateTest : public testing::Test {
scoped_ptr<TestNetworkDelegateImpl> test_network_delegate(
new TestNetworkDelegateImpl(&layered_network_delegate_counters));
test_network_delegate_ = test_network_delegate.get();
- layered_network_delegate_ =
- scoped_ptr<TestLayeredNetworkDelegate>(new TestLayeredNetworkDelegate(
- test_network_delegate.Pass(), &layered_network_delegate_counters));
+ layered_network_delegate_ = scoped_ptr<TestLayeredNetworkDelegate>(
+ new TestLayeredNetworkDelegate(std::move(test_network_delegate),
+ &layered_network_delegate_counters));
}
CountersMap layered_network_delegate_counters;
diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc
index c699b46..6649532 100644
--- a/net/base/mock_file_stream.cc
+++ b/net/base/mock_file_stream.cc
@@ -4,6 +4,8 @@
#include "net/base/mock_file_stream.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
@@ -25,12 +27,11 @@ MockFileStream::MockFileStream(
MockFileStream::MockFileStream(
base::File file,
const scoped_refptr<base::TaskRunner>& task_runner)
- : FileStream(file.Pass(), task_runner),
+ : FileStream(std::move(file), task_runner),
forced_error_(OK),
async_error_(false),
throttled_(false),
- weak_factory_(this) {
-}
+ weak_factory_(this) {}
MockFileStream::~MockFileStream() {
}
diff --git a/net/base/network_quality_estimator.cc b/net/base/network_quality_estimator.cc
index 2344a02..c67b641 100644
--- a/net/base/network_quality_estimator.cc
+++ b/net/base/network_quality_estimator.cc
@@ -8,6 +8,7 @@
#include <algorithm>
#include <cmath>
#include <limits>
+#include <utility>
#include <vector>
#include "base/logging.h"
@@ -121,7 +122,7 @@ const int32_t NetworkQualityEstimator::kInvalidThroughput = 0;
NetworkQualityEstimator::NetworkQualityEstimator(
scoped_ptr<ExternalEstimateProvider> external_estimates_provider,
const std::map<std::string, std::string>& variation_params)
- : NetworkQualityEstimator(external_estimates_provider.Pass(),
+ : NetworkQualityEstimator(std::move(external_estimates_provider),
variation_params,
false,
false) {}
@@ -140,7 +141,7 @@ NetworkQualityEstimator::NetworkQualityEstimator(
downstream_throughput_kbps_observations_(
GetWeightMultiplierPerSecond(variation_params)),
rtt_msec_observations_(GetWeightMultiplierPerSecond(variation_params)),
- external_estimate_provider_(external_estimates_provider.Pass()) {
+ external_estimate_provider_(std::move(external_estimates_provider)) {
static_assert(kMinRequestDurationMicroseconds > 0,
"Minimum request duration must be > 0");
static_assert(kDefaultHalfLifeSeconds > 0,
diff --git a/net/base/network_quality_estimator_unittest.cc b/net/base/network_quality_estimator_unittest.cc
index 93cd009..cf1197f 100644
--- a/net/base/network_quality_estimator_unittest.cc
+++ b/net/base/network_quality_estimator_unittest.cc
@@ -5,9 +5,9 @@
#include "net/base/network_quality_estimator.h"
#include <stdint.h>
-
#include <limits>
#include <map>
+#include <utility>
#include <vector>
#include "base/files/file_path.h"
@@ -39,7 +39,7 @@ class TestNetworkQualityEstimator : public net::NetworkQualityEstimator {
TestNetworkQualityEstimator(
const std::map<std::string, std::string>& variation_params,
scoped_ptr<net::ExternalEstimateProvider> external_estimate_provider)
- : NetworkQualityEstimator(external_estimate_provider.Pass(),
+ : NetworkQualityEstimator(std::move(external_estimate_provider),
variation_params,
true,
true) {
@@ -76,7 +76,7 @@ class TestNetworkQualityEstimator : public net::NetworkQualityEstimator {
http_response->set_code(net::HTTP_OK);
http_response->set_content("hello");
http_response->set_content_type("text/plain");
- return http_response.Pass();
+ return std::move(http_response);
}
// Returns a GURL hosted at embedded test server.
@@ -808,7 +808,7 @@ TEST(NetworkQualityEstimatorTest, InvalidExternalEstimateProvider) {
invalid_external_estimate_provider);
TestNetworkQualityEstimator estimator(std::map<std::string, std::string>(),
- external_estimate_provider.Pass());
+ std::move(external_estimate_provider));
base::TimeDelta rtt;
int32_t kbps;
@@ -906,7 +906,7 @@ TEST(NetworkQualityEstimatorTest, TestExternalEstimateProvider) {
test_external_estimate_provider);
std::map<std::string, std::string> variation_params;
TestNetworkQualityEstimator estimator(variation_params,
- external_estimate_provider.Pass());
+ std::move(external_estimate_provider));
base::TimeDelta rtt;
int32_t kbps;
@@ -981,7 +981,7 @@ TEST(NetworkQualityEstimatorTest, TestExternalEstimateProviderMergeEstimates) {
std::map<std::string, std::string> variation_params;
TestNetworkQualityEstimator estimator(variation_params,
- external_estimate_provider.Pass());
+ std::move(external_estimate_provider));
base::TimeDelta rtt;
// Estimate provided by network quality estimator should match the estimate
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index a0c00fb..9bb8e7e 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -4,6 +4,8 @@
#include "net/base/sdch_manager.h"
+#include <utility>
+
#include "base/base64url.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
@@ -247,7 +249,7 @@ SdchManager::GetDictionarySet(const GURL& target_url) {
UMA_HISTOGRAM_COUNTS("Sdch3.Advertisement_Count", count);
- return result.Pass();
+ return result;
}
scoped_ptr<SdchManager::DictionarySet>
@@ -260,15 +262,15 @@ SdchManager::GetDictionarySetByHash(
*problem_code = SDCH_DICTIONARY_HASH_NOT_FOUND;
const auto& it = dictionaries_.find(server_hash);
if (it == dictionaries_.end())
- return result.Pass();
+ return result;
*problem_code = it->second->data.CanUse(target_url);
if (*problem_code != SDCH_OK)
- return result.Pass();
+ return result;
result.reset(new DictionarySet);
result->AddDictionary(it->first, it->second);
- return result.Pass();
+ return result;
}
// static
@@ -431,7 +433,7 @@ SdchProblemCode SdchManager::RemoveSdchDictionary(
// static
scoped_ptr<SdchManager::DictionarySet>
SdchManager::CreateEmptyDictionarySetForTesting() {
- return scoped_ptr<DictionarySet>(new DictionarySet).Pass();
+ return scoped_ptr<DictionarySet>(new DictionarySet);
}
scoped_ptr<base::Value> SdchManager::SdchInfoToValue() const {
@@ -452,11 +454,11 @@ scoped_ptr<base::Value> SdchManager::SdchInfoToValue() const {
port_it != entry.second->data.ports().end(); ++port_it) {
port_list->AppendInteger(*port_it);
}
- entry_dict->Set("ports", port_list.Pass());
+ entry_dict->Set("ports", std::move(port_list));
entry_dict->SetString("server_hash", entry.first);
- entry_list->Append(entry_dict.Pass());
+ entry_list->Append(std::move(entry_dict));
}
- value->Set("dictionaries", entry_list.Pass());
+ value->Set("dictionaries", std::move(entry_list));
entry_list.reset(new base::ListValue());
for (DomainBlacklistInfo::const_iterator it = blacklisted_domains_.begin();
@@ -468,11 +470,11 @@ scoped_ptr<base::Value> SdchManager::SdchInfoToValue() const {
if (it->second.count != INT_MAX)
entry_dict->SetInteger("tries", it->second.count);
entry_dict->SetInteger("reason", it->second.reason);
- entry_list->Append(entry_dict.Pass());
+ entry_list->Append(std::move(entry_dict));
}
- value->Set("blacklisted", entry_list.Pass());
+ value->Set("blacklisted", std::move(entry_list));
- return value.Pass();
+ return std::move(value);
}
} // namespace net
diff --git a/net/base/sdch_manager_unittest.cc b/net/base/sdch_manager_unittest.cc
index 6a21fcb..6ae186f0 100644
--- a/net/base/sdch_manager_unittest.cc
+++ b/net/base/sdch_manager_unittest.cc
@@ -569,8 +569,8 @@ TEST_F(SdchManagerTest, ExpirationCheckedProperly) {
// It should be visible if looked up by hash whether expired or not.
SdchProblemCode problem_code;
scoped_ptr<SdchManager::DictionarySet> hash_set(
- sdch_manager()->GetDictionarySetByHash(
- target_gurl, server_hash, &problem_code).Pass());
+ sdch_manager()->GetDictionarySetByHash(target_gurl, server_hash,
+ &problem_code));
ASSERT_TRUE(hash_set);
ASSERT_EQ(SDCH_OK, problem_code);
diff --git a/net/base/sdch_net_log_params.cc b/net/base/sdch_net_log_params.cc
index 81f8476..c802742 100644
--- a/net/base/sdch_net_log_params.cc
+++ b/net/base/sdch_net_log_params.cc
@@ -4,6 +4,8 @@
#include "net/base/sdch_net_log_params.h"
+#include <utility>
+
#include "base/values.h"
#include "net/base/net_errors.h"
#include "url/gurl.h"
@@ -16,7 +18,7 @@ scoped_ptr<base::Value> NetLogSdchResourceProblemCallback(
scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->SetInteger("sdch_problem_code", problem);
dict->SetInteger("net_error", ERR_FAILED);
- return dict.Pass();
+ return std::move(dict);
}
scoped_ptr<base::Value> NetLogSdchDictionaryFetchProblemCallback(
@@ -29,7 +31,7 @@ scoped_ptr<base::Value> NetLogSdchDictionaryFetchProblemCallback(
dict->SetString("dictionary_url", url.spec());
if (is_error)
dict->SetInteger("net_error", ERR_FAILED);
- return dict.Pass();
+ return std::move(dict);
}
} // namespace net
generated by cgit v1.1 at 2024-09-17 04:33:16 +0000