Fix up -Winconsistent-missing-override

  (and a couple presubmit fixes)

This allows us to turn back on -Werror for LLVM coverage builds,
and more generally supports building with Clang 3.7.

No public API changes.
TBR=reed@google.com

BUG=skia:

Review URL: https://codereview.chromium.org/1232463006

1 files changed, 2 insertions, 2 deletions

diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index 0a6af34d8f..2d051c93ed 100644
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -90,7 +90,7 @@ protected:
     }
 
 
-    virtual const char* onGetName() {
+    const char* onGetName() override {
         fName.printf("text_%g", SkScalarToFloat(fPaint.getTextSize()));
         if (fDoPos) {
             fName.append("_pos");
@@ -109,7 +109,7 @@ protected:
         return fName.c_str();
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         const SkIPoint dim = this->getSize();
         SkRandom rand;