Make FuzzedDataProvider vend std::strings

base/test/fuzzed_data_provider.h

 // Copyright 2016 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.
 
 #ifndef BASE_TEST_FUZZED_DATA_PROVIDER_H_
 #define BASE_TEST_FUZZED_DATA_PROVIDER_H_
 
 #include <stdint.h>
+#include <string>

[Lei Zhang, 2016/10/19 17:49:49]

nit: Chromium style still likes to have a separator between C and C++ headers.

[Charlie Harrison, 2016/10/19 18:00:56]

Done.

 
 #include "base/base_export.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 
 namespace base {
 
 // Utility class to break up fuzzer input for multiple consumers. Whenever run
 // on the same input, provides the same output, as long as its methods are
 // called in the same order, with the same arguments.
 class FuzzedDataProvider {
  public:
   // |data| is an array of length |size| that the FuzzedDataProvider wraps to
   // provide more granular access. |data| must outlive the FuzzedDataProvider.
   FuzzedDataProvider(const uint8_t* data, size_t size);
   ~FuzzedDataProvider();
 
-  // Returns a StringPiece containing |num_bytes| of input data. If fewer than
-  // |num_bytes| of data remain, returns a shorter StringPiece containing all
-  // of the data that's left. The data pointed at by the returned StringPiece
-  // must not be used after the FuzzedDataProvider is destroyed.
-  StringPiece ConsumeBytes(size_t num_bytes);
+  // Returns a std::string containing |num_bytes| of input data. If fewer than
+  // |num_bytes| of data remain, returns a shorter std::string containing all
+  // of the data that's left.
+  std::string ConsumeBytes(size_t num_bytes);
 
-  // Returns a StringPiece containing all remaining bytes of the input data.
-  // The data pointed at by the returned StringPiece must not be used after the
-  // FuzzedDataProvider is destroyed.
-  StringPiece ConsumeRemainingBytes();
+  // Returns a std::string containing all remaining bytes of the input data.
+  std::string ConsumeRemainingBytes();
 
   // Returns a number in the range [min, max] by consuming bytes from the input
   // data. The value might not be uniformly distributed in the given range. If
   // there's no input data left, always returns |min|. |min| must be less than
   // or equal to |max|.
   uint32_t ConsumeUint32InRange(uint32_t min, uint32_t max);
   int ConsumeInt32InRange(int min, int max);
 
   // Returns a bool, or false when no data remains.
   bool ConsumeBool();
@@ skipping 20 matching lines @@
 
  private:
   StringPiece remaining_data_;
 
   DISALLOW_COPY_AND_ASSIGN(FuzzedDataProvider);
 };
 
 }  // namespace base
 
 #endif  // BASE_TEST_FUZZED_DATA_PROVIDER_H_