Merge from Chromium at DEPS revision 614f7b807940

This commit was generated by merge_to_master.py.

Change-Id: I89d093f14f8025ce1e505ce2a2755212c5c4fd2a

3 files changed, 7 insertions, 7 deletions

diff --git a/components/rappor/byte_vector_utils.h b/components/rappor/byte_vector_utils.h
index 3f8eb27780..3090d9bc76 100644
--- a/components/rappor/byte_vector_utils.h
+++ b/components/rappor/byte_vector_utils.h
@@ -62,7 +62,7 @@ class ByteVectorGenerator {
   DISALLOW_COPY_AND_ASSIGN(ByteVectorGenerator);
 };
 
-// A ByteVectorGenerator that uses a psuedo-random function to generate a
+// A ByteVectorGenerator that uses a pseudo-random function to generate a
 // deterministically random bits.  This class only implements a single request
 // from HMAC_DRBG and streams up to 2^19 bits from that request.
 // Ref: http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
@@ -80,7 +80,7 @@ class HmacByteVectorGenerator : public ByteVectorGenerator {
                           const std::string& entropy_input,
                           const std::string& personalization_string);
 
-  virtual ~HmacByteVectorGenerator();
+  ~HmacByteVectorGenerator() override;
 
   // Generates a random string suitable for passing to the constructor as
   // |entropy_input|.
@@ -95,7 +95,7 @@ class HmacByteVectorGenerator : public ByteVectorGenerator {
   explicit HmacByteVectorGenerator(const HmacByteVectorGenerator& prev_request);
 
   // ByteVector implementation:
-  virtual ByteVector GetRandomByteVector() OVERRIDE;
+  ByteVector GetRandomByteVector() override;
 
  private:
   // HMAC initalized with the value of "Key" HMAC_DRBG_Initialize.
diff --git a/components/rappor/log_uploader.h b/components/rappor/log_uploader.h
index a446a34d46..f6219bb11c 100644
--- a/components/rappor/log_uploader.h
+++ b/components/rappor/log_uploader.h
@@ -39,7 +39,7 @@ class LogUploader : public net::URLFetcherDelegate {
 
   // If the object is destroyed (or the program terminates) while logs are
   // queued, the logs are lost.
-  virtual ~LogUploader();
+  ~LogUploader() override;
 
   // Adds an entry to the queue of logs to be uploaded to the server.  The
   // uploader makes no assumptions about the format of |log| and simply sends
@@ -64,7 +64,7 @@ class LogUploader : public net::URLFetcherDelegate {
  private:
   // Implements net::URLFetcherDelegate. Called after transmission completes
   // (whether successful or not).
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Called when the upload is completed.
   void OnUploadFinished(bool server_is_healthy, bool more_logs_remaining);
diff --git a/components/rappor/log_uploader_unittest.cc b/components/rappor/log_uploader_unittest.cc
index ac37ed999a..f3799ca08a 100644
--- a/components/rappor/log_uploader_unittest.cc
+++ b/components/rappor/log_uploader_unittest.cc
@@ -35,13 +35,13 @@ class TestLogUploader : public LogUploader {
   }
 
  protected:
-  virtual bool IsUploadScheduled() const OVERRIDE {
+  bool IsUploadScheduled() const override {
     return last_interval_set() != base::TimeDelta();
   }
 
   // Schedules a future call to StartScheduledUpload if one isn't already
   // pending.
-  virtual void ScheduleNextUpload(base::TimeDelta interval) OVERRIDE {
+  void ScheduleNextUpload(base::TimeDelta interval) override {
     EXPECT_EQ(last_interval_set(), base::TimeDelta());
     last_interval_set_ = interval;
   }