Replacing the OVERRIDE with override and FINAL with final in content/browser/android

content/browser/android/java/gin_java_method_invocation_helper_unittest.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 "content/browser/android/java/gin_java_method_invocation_helper.h"
 
 #include "base/android/jni_android.h"
 #include "content/browser/android/java/jni_helper.h"
 #include "content/common/android/gin_java_bridge_value.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 class NullObjectDelegate
     : public GinJavaMethodInvocationHelper::ObjectDelegate {
  public:
   NullObjectDelegate() {}
 
   virtual ~NullObjectDelegate() {}
 
   virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
-      JNIEnv* env) OVERRIDE {
+      JNIEnv* env) override {
     return base::android::ScopedJavaLocalRef<jobject>();
   }
 
   virtual base::android::ScopedJavaLocalRef<jclass> GetLocalClassRef(
-      JNIEnv* env) OVERRIDE {
+      JNIEnv* env) override {
     return base::android::ScopedJavaLocalRef<jclass>();
   }
 
   virtual const JavaMethod* FindMethod(const std::string& method_name,
-                                       size_t num_parameters) OVERRIDE {
+                                       size_t num_parameters) override {
     return NULL;
   }
 
-  virtual bool IsObjectGetClassMethod(const JavaMethod* method) OVERRIDE {
+  virtual bool IsObjectGetClassMethod(const JavaMethod* method) override {
     return false;
   }
 
   virtual const base::android::JavaRef<jclass>& GetSafeAnnotationClass()
-      OVERRIDE {
+      override {
     return safe_annotation_class_;
   }
 
  private:
   base::android::ScopedJavaLocalRef<jclass> safe_annotation_class_;
 
   DISALLOW_COPY_AND_ASSIGN(NullObjectDelegate);
 };
 
 class NullDispatcherDelegate
     : public GinJavaMethodInvocationHelper::DispatcherDelegate {
  public:
   NullDispatcherDelegate() {}
 
   virtual ~NullDispatcherDelegate() {}
 
   virtual JavaObjectWeakGlobalRef GetObjectWeakRef(
-      GinJavaBoundObject::ObjectID object_id) OVERRIDE {
+      GinJavaBoundObject::ObjectID object_id) override {
     return JavaObjectWeakGlobalRef();
   }
 
   DISALLOW_COPY_AND_ASSIGN(NullDispatcherDelegate);
 };
 
 }  // namespace
 
 class GinJavaMethodInvocationHelperTest : public testing::Test {
 };
 
 namespace {
 
 class CountingDispatcherDelegate
     : public GinJavaMethodInvocationHelper::DispatcherDelegate {
  public:
   CountingDispatcherDelegate() {}
 
   virtual ~CountingDispatcherDelegate() {}
 
   virtual JavaObjectWeakGlobalRef GetObjectWeakRef(
-      GinJavaBoundObject::ObjectID object_id) OVERRIDE {
+      GinJavaBoundObject::ObjectID object_id) override {
     counters_[object_id]++;
     return JavaObjectWeakGlobalRef();
   }
 
   void AssertInvocationsCount(GinJavaBoundObject::ObjectID begin_object_id,
                               GinJavaBoundObject::ObjectID end_object_id) {
     EXPECT_EQ(end_object_id - begin_object_id,
               static_cast<int>(counters_.size()));
     for (GinJavaBoundObject::ObjectID i = begin_object_id;
          i < end_object_id; ++i) {
@@ skipping 78 matching lines @@
             base::android::GetClass(env, "java/lang/Object").obj(),
             method_id,
             false));
     EXPECT_TRUE(method_obj.obj());
     method_.reset(new JavaMethod(method_obj));
   }
 
   virtual ~ObjectIsGoneObjectDelegate() {}
 
   virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
-      JNIEnv* env) OVERRIDE {
+      JNIEnv* env) override {
     get_local_ref_called_ = true;
     return NullObjectDelegate::GetLocalRef(env);
   }
 
   virtual const JavaMethod* FindMethod(const std::string& method_name,
-                                       size_t num_parameters) OVERRIDE {
+                                       size_t num_parameters) override {
     return method_.get();
   }
 
   bool get_local_ref_called() { return get_local_ref_called_; }
 
   const std::string& get_method_name() { return method_->name(); }
 
  protected:
   scoped_ptr<JavaMethod> method_;
   bool get_local_ref_called_;
@@ skipping 27 matching lines @@
 
 namespace {
 
 class MethodNotFoundObjectDelegate : public NullObjectDelegate {
  public:
   MethodNotFoundObjectDelegate() : find_method_called_(false) {}
 
   virtual ~MethodNotFoundObjectDelegate() {}
 
   virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
-      JNIEnv* env) OVERRIDE {
+      JNIEnv* env) override {
     return base::android::ScopedJavaLocalRef<jobject>(
         env, static_cast<jobject>(env->FindClass("java/lang/String")));
   }
 
   virtual const JavaMethod* FindMethod(const std::string& method_name,
-                                       size_t num_parameters) OVERRIDE {
+                                       size_t num_parameters) override {
     find_method_called_ = true;
     return NULL;
   }
 
   bool find_method_called() const { return find_method_called_; }
 
  protected:
   bool find_method_called_;
 
  private:
@@ skipping 25 matching lines @@
 
 namespace {
 
 class GetClassObjectDelegate : public MethodNotFoundObjectDelegate {
  public:
   GetClassObjectDelegate() : get_class_called_(false) {}
 
   virtual ~GetClassObjectDelegate() {}
 
   virtual const JavaMethod* FindMethod(const std::string& method_name,
-                                       size_t num_parameters) OVERRIDE {
+                                       size_t num_parameters) override {
     find_method_called_ = true;
     return kFakeGetClass;
   }
 
-  virtual bool IsObjectGetClassMethod(const JavaMethod* method) OVERRIDE {
+  virtual bool IsObjectGetClassMethod(const JavaMethod* method) override {
     get_class_called_ = true;
     return kFakeGetClass == method;
   }
 
   bool get_class_called() const { return get_class_called_; }
 
  private:
   static const JavaMethod* kFakeGetClass;
   bool get_class_called_;
 
@@ skipping 26 matching lines @@
   helper->Invoke();
   EXPECT_TRUE(object_delegate->find_method_called());
   EXPECT_TRUE(object_delegate->get_class_called());
   EXPECT_TRUE(helper->HoldsPrimitiveResult());
   EXPECT_TRUE(helper->GetPrimitiveResult().empty());
   EXPECT_EQ(kGinJavaBridgeAccessToObjectGetClassIsBlocked,
             helper->GetInvocationError());
 }
 
 }  // namespace content