update_engine: Clean up angle brackets in template types.
C++11 no longer has the angle bracket pitfall in template types.
BUG=None
TEST=`FEATURES=test emerge-$BOARD update_engine`
Change-Id: I0168b9f208ad8e62ae614b8a3b8bcf31c58fa9f2
Reviewed-on: https://chromium-review.googlesource.com/219203
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index ec074d7..531986f 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -924,7 +924,7 @@
void MultiTest(HttpFetcher* fetcher_in,
const string& url,
- const vector<pair<off_t, off_t> >& ranges,
+ const vector<pair<off_t, off_t>>& ranges,
const string& expected_prefix,
off_t expected_size,
HttpResponseCode expected_response_code) {
@@ -938,7 +938,7 @@
dynamic_cast<MultiRangeHttpFetcher*>(fetcher_in);
ASSERT_TRUE(multi_fetcher);
multi_fetcher->ClearRanges();
- for (vector<pair<off_t, off_t> >::const_iterator it = ranges.begin(),
+ for (vector<pair<off_t, off_t>>::const_iterator it = ranges.begin(),
e = ranges.end(); it != e; ++it) {
std::string tmp_str = base::StringPrintf("%jd+", it->first);
if (it->second > 0) {
@@ -974,7 +974,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(0, 25));
ranges.push_back(make_pair(99, 0));
MultiTest(this->test_.NewLargeFetcher(),
@@ -992,7 +992,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(0, 24));
MultiTest(this->test_.NewLargeFetcher(),
this->test_.BigUrl(server->GetPort()),
@@ -1009,7 +1009,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(kBigLength - 2, 0));
ranges.push_back(make_pair(kBigLength - 3, 0));
MultiTest(this->test_.NewLargeFetcher(),
@@ -1027,7 +1027,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(kBigLength - 2, 4));
for (int i = 0; i < 2; ++i) {
LOG(INFO) << "i = " << i;
@@ -1053,7 +1053,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(0, 25));
ranges.push_back(make_pair(99, 0));
MultiTest(this->test_.NewLargeFetcher(3),
@@ -1075,7 +1075,7 @@
scoped_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- vector<pair<off_t, off_t> > ranges;
+ vector<pair<off_t, off_t>> ranges;
ranges.push_back(make_pair(0, 25));
ranges.push_back(make_pair(99, 0));
MultiTest(this->test_.NewLargeFetcher(2),