Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: net/spdy/hpack/hpack_header_table_test.cc

Issue 2801603003: Add SpdyString alias for std::string in net/spdy. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/hpack/hpack_entry_test.cc ('k') | net/spdy/hpack/hpack_huffman_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/hpack/hpack_header_table_test.cc
diff --git a/net/spdy/hpack/hpack_header_table_test.cc b/net/spdy/hpack/hpack_header_table_test.cc
index e5fb694a016139c6d1622dc681e1603a0402ba98..f46968eaecd624c3acec58066a384980ac9e5dba 100644
--- a/net/spdy/hpack/hpack_header_table_test.cc
+++ b/net/spdy/hpack/hpack_header_table_test.cc
@@ -6,19 +6,18 @@
#include <algorithm>
#include <set>
-#include <string>
#include <vector>
#include "base/macros.h"
#include "net/spdy/hpack/hpack_constants.h"
#include "net/spdy/hpack/hpack_entry.h"
+#include "net/spdy/platform/api/spdy_string.h"
#include "net/spdy/spdy_flags.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace net {
using std::distance;
-using std::string;
namespace test {
@@ -77,8 +76,8 @@ class HpackHeaderTableTest : public ::testing::Test {
// Returns an entry whose Size() is equal to the given one.
static HpackEntry MakeEntryOfSize(uint32_t size) {
EXPECT_GE(size, HpackEntry::kSizeOverhead);
- string name((size - HpackEntry::kSizeOverhead) / 2, 'n');
- string value(size - HpackEntry::kSizeOverhead - name.size(), 'v');
+ SpdyString name((size - HpackEntry::kSizeOverhead) / 2, 'n');
+ SpdyString value(size - HpackEntry::kSizeOverhead - name.size(), 'v');
HpackEntry entry(name, value, false, 0);
EXPECT_EQ(size, entry.Size());
return entry;
@@ -124,7 +123,7 @@ class HpackHeaderTableTest : public ::testing::Test {
}
}
- HpackEntry DynamicEntry(const string& name, const string& value) {
+ HpackEntry DynamicEntry(const SpdyString& name, const SpdyString& value) {
peer_.AddDynamicEntry(name, value);
return peer_.dynamic_entries().back();
}
@@ -259,7 +258,7 @@ TEST_F(HpackHeaderTableTest, EntryIndexing) {
}
TEST_F(HpackHeaderTableTest, SetSizes) {
- string key = "key", value = "value";
+ SpdyString key = "key", value = "value";
const HpackEntry* entry1 = table_.TryAddEntry(key, value);
const HpackEntry* entry2 = table_.TryAddEntry(key, value);
const HpackEntry* entry3 = table_.TryAddEntry(key, value);
@@ -291,7 +290,7 @@ TEST_F(HpackHeaderTableTest, SetSizes) {
}
TEST_F(HpackHeaderTableTest, EvictionCountForEntry) {
- string key = "key", value = "value";
+ SpdyString key = "key", value = "value";
const HpackEntry* entry1 = table_.TryAddEntry(key, value);
const HpackEntry* entry2 = table_.TryAddEntry(key, value);
size_t entry3_size = HpackEntry::Size(key, value);
@@ -308,7 +307,7 @@ TEST_F(HpackHeaderTableTest, EvictionCountForEntry) {
}
TEST_F(HpackHeaderTableTest, EvictionCountToReclaim) {
- string key = "key", value = "value";
+ SpdyString key = "key", value = "value";
const HpackEntry* entry1 = table_.TryAddEntry(key, value);
const HpackEntry* entry2 = table_.TryAddEntry(key, value);
« no previous file with comments | « net/spdy/hpack/hpack_entry_test.cc ('k') | net/spdy/hpack/hpack_huffman_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698