Add SpdyString alias for std::string in net/spdy.

net/spdy/fuzzing/hpack_fuzz_util.cc

 // Copyright 2014 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 "net/spdy/fuzzing/hpack_fuzz_util.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/rand_util.h"
@@ skipping 15 matching lines @@
 const size_t kNameLengthMean = 5;
 const size_t kNameLengthMax = 30;
 // Approximate distribution of header value lengths.
 const size_t kValueLengthMean = 15;
 const size_t kValueLengthMax = 75;
 
 }  //  namespace
 
 using base::RandBytesAsString;
 using std::map;
-using std::string;
 
 HpackFuzzUtil::GeneratorContext::GeneratorContext() {}
 HpackFuzzUtil::GeneratorContext::~GeneratorContext() {}
 
 HpackFuzzUtil::Input::Input() : offset(0) {}
 HpackFuzzUtil::Input::~Input() {}
 
 HpackFuzzUtil::FuzzerContext::FuzzerContext() {}
 HpackFuzzUtil::FuzzerContext::~FuzzerContext() {}
 
@@ skipping 28 matching lines @@
     GeneratorContext* context) {
   SpdyHeaderBlock headers;
 
   size_t header_count = 1 + SampleExponential(kHeaderCountMean,
                                               kHeaderCountMax);
   for (size_t j = 0; j != header_count; ++j) {
     size_t name_index = SampleExponential(kHeaderIndexMean,
                                           kHeaderIndexMax);
     size_t value_index = SampleExponential(kHeaderIndexMean,
                                            kHeaderIndexMax);
-    string name, value;
+    SpdyString name, value;
     if (name_index >= context->names.size()) {
       context->names.push_back(
           RandBytesAsString(1 + SampleExponential(kNameLengthMean,
                                                   kNameLengthMax)));
       name = context->names.back();
     } else {
       name = context->names[name_index];
     }
     if (value_index >= context->values.size()) {
       context->values.push_back(
@@ skipping 29 matching lines @@
 
   if (input->remaining() < length) {
     return false;
   }
   *out = SpdyStringPiece(input->ptr(), length);
   input->offset += length;
   return true;
 }
 
 // static
-string HpackFuzzUtil::HeaderBlockPrefix(size_t block_size) {
+SpdyString HpackFuzzUtil::HeaderBlockPrefix(size_t block_size) {
   uint32_t length = base::HostToNet32(static_cast<uint32_t>(block_size));
-  return string(reinterpret_cast<char*>(&length), sizeof(uint32_t));
+  return SpdyString(reinterpret_cast<char*>(&length), sizeof(uint32_t));
 }
 
 // static
 void HpackFuzzUtil::InitializeFuzzerContext(FuzzerContext* context) {
   context->first_stage.reset(new HpackDecoder());
   context->second_stage.reset(new HpackEncoder(ObtainHpackHuffmanTable()));
   context->third_stage.reset(new HpackDecoder());
 }
 
 // static
 bool HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(
     FuzzerContext* context,
     SpdyStringPiece input_block) {
   // First stage: Decode the input header block. This may fail on invalid input.
   if (!context->first_stage->HandleControlFrameHeadersData(
           input_block.data(), input_block.size())) {
     return false;
   }
   if (!context->first_stage->HandleControlFrameHeadersComplete(nullptr)) {
     return false;
   }
   // Second stage: Re-encode the decoded header block. This must succeed.
-  string second_stage_out;
+  SpdyString second_stage_out;
   CHECK(context->second_stage->EncodeHeaderSet(
       context->first_stage->decoded_block(), &second_stage_out));
 
   // Third stage: Expect a decoding of the re-encoded block to succeed, but
   // don't require it. It's possible for the stage-two encoder to produce an
   // output which violates decoder size tolerances.
   if (!context->third_stage->HandleControlFrameHeadersData(
           second_stage_out.data(), second_stage_out.length())) {
     return false;
   }
@@ skipping 11 matching lines @@
   uint64_t bits_to_flip = flip_per_thousand * (1 + buffer_bit_length / 1024);
 
   // Iteratively identify & flip offsets in the buffer bit-sequence.
   for (uint64_t i = 0; i != bits_to_flip; ++i) {
     uint64_t bit_offset = base::RandUint64() % buffer_bit_length;
     buffer[bit_offset / 8u] ^= (1 << (bit_offset % 8u));
   }
 }
 
 }  // namespace net