diff options
| author | davidben <davidben@chromium.org> | 2015-11-30 16:01:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 00:02:51 +0000 |
| commit | b50f00c17dac2371146653d82acef7338f386d8c (patch) | |
| tree | 16d12211ff2c57ad27f0bbc04c87e6f2832f13d2 /google_apis | |
| parent | 3d49a3c17c46a39da8d6d8ca1d392a4164522eb7 (diff) | |
| download | chromium_src-b50f00c17dac2371146653d82acef7338f386d8c.zip chromium_src-b50f00c17dac2371146653d82acef7338f386d8c.tar.gz chromium_src-b50f00c17dac2371146653d82acef7338f386d8c.tar.bz2 | |
Convert various vector_as_array calls to vector::data.
This gets everything that wasn't covered by a previous CL in flight.
BUG=556678
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1471043004
Cr-Commit-Position: refs/heads/master@{#362283}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gcm/base/socket_stream_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/google_apis/gcm/base/socket_stream_unittest.cc b/google_apis/gcm/base/socket_stream_unittest.cc index 3ca5d00..561e5cf 100644 --- a/google_apis/gcm/base/socket_stream_unittest.cc +++ b/google_apis/gcm/base/socket_stream_unittest.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "base/stl_util.h" #include "base/strings/string_piece.h" #include "net/socket/socket_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -87,10 +86,9 @@ void GCMSocketStreamTest::BuildSocket(const ReadList& read_list, const WriteList& write_list) { mock_reads_ = read_list; mock_writes_ = write_list; - data_provider_.reset( - new net::StaticSocketDataProvider( - vector_as_array(&mock_reads_), mock_reads_.size(), - vector_as_array(&mock_writes_), mock_writes_.size())); + data_provider_.reset(new net::StaticSocketDataProvider( + mock_reads_.data(), mock_reads_.size(), mock_writes_.data(), + mock_writes_.size())); socket_factory_.AddSocketDataProvider(data_provider_.get()); OpenConnection(); ResetInputStream(); |