Linux/ChromeOS Chromium style checker cleanup, chrome/ edition part 1.

chrome/nacl/nacl_validation_query_unittest.cc

 // Copyright (c) 2012 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 "chrome/nacl/nacl_validation_db.h"
 #include "chrome/nacl/nacl_validation_query.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // This test makes sure that validation signature generation is performed
 // correctly.  In effect, this means that we are checking all of the data
@@ skipping 21 matching lines @@
     "1234567890123456789012345678901234567890123456789012345678901234567890";
 
 class MockValidationDB : public NaClValidationDB {
  public:
   MockValidationDB()
     : did_query_(false),
       did_set_(false),
       status_(true) {
   }
 
-  bool QueryKnownToValidate(const std::string& signature) {
+  virtual bool QueryKnownToValidate(const std::string& signature) OVERRIDE {
     // The typecast is needed to work around gtest trying to take the address
     // of a constant.
     EXPECT_EQ((int) NaClValidationQuery::kDigestLength,
               (int) signature.length());
     EXPECT_FALSE(did_query_);
     EXPECT_FALSE(did_set_);
     did_query_ = true;
     memcpy(query_signature_, signature.data(),
            NaClValidationQuery::kDigestLength);
     return status_;
   }
 
-  void SetKnownToValidate(const std::string& signature) {
+  virtual void SetKnownToValidate(const std::string& signature) OVERRIDE {
     // The typecast is needed to work around gtest trying to take the address
     // of a constant.
     ASSERT_EQ((int) NaClValidationQuery::kDigestLength,
               (int) signature.length());
     EXPECT_TRUE(did_query_);
     EXPECT_FALSE(did_set_);
     did_set_ = true;
     memcpy(set_signature_, signature.data(),
            NaClValidationQuery::kDigestLength);
     // Signatures should be the same.
@@ skipping 20 matching lines @@
   scoped_ptr<MockValidationDB> db;
   scoped_ptr<NaClValidationQueryContext> context;
   scoped_ptr<NaClValidationQuery> query;
 };
 
 class NaClValidationQueryTest : public ::testing::Test {
  protected:
   scoped_ptr<TestQuery> query1;
   scoped_ptr<TestQuery> query2;
 
-  void SetUp() {
+  virtual void SetUp() {
     query1.reset(new TestQuery(kKey, kVersion));
     query2.reset(new TestQuery(kKey, kVersion));
   }
 
   void AssertQuerySame() {
     ASSERT_TRUE(query1->db->did_query_);
     ASSERT_TRUE(query2->db->did_query_);
     ASSERT_EQ(0, memcmp(query1->db->query_signature_,
                         query2->db->query_signature_,
                         NaClValidationQuery::kDigestLength));
@@ skipping 160 matching lines @@
   query1->query->AddData(kShortData, sizeof(kShortData));
   query1->query->QueryKnownToValidate();
 
   query2->query->AddData(kShortData, sizeof(kShortData));
   query2->query->QueryKnownToValidate();
 
   AssertQueryDifferent();
 }
 
 }