Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: content/browser/android/java/gin_java_method_invocation_helper_unittest.cc

Issue 897773002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
diff --git a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
index ccd508355bb23291ba7b1e1f97849f549621cb0a..fcda3cda9345ef6930a571119a4305713c4ffc8f 100644
--- a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
@@ -18,29 +18,27 @@ class NullObjectDelegate
public:
NullObjectDelegate() {}
- virtual ~NullObjectDelegate() {}
+ ~NullObjectDelegate() override {}
- virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
- JNIEnv* env) override {
+ base::android::ScopedJavaLocalRef<jobject> GetLocalRef(JNIEnv* env) override {
return base::android::ScopedJavaLocalRef<jobject>();
}
- virtual base::android::ScopedJavaLocalRef<jclass> GetLocalClassRef(
+ base::android::ScopedJavaLocalRef<jclass> GetLocalClassRef(
JNIEnv* env) override {
return base::android::ScopedJavaLocalRef<jclass>();
}
- virtual const JavaMethod* FindMethod(const std::string& method_name,
- size_t num_parameters) override {
+ const JavaMethod* FindMethod(const std::string& method_name,
+ size_t num_parameters) override {
return NULL;
}
- virtual bool IsObjectGetClassMethod(const JavaMethod* method) override {
+ bool IsObjectGetClassMethod(const JavaMethod* method) override {
return false;
}
- virtual const base::android::JavaRef<jclass>& GetSafeAnnotationClass()
- override {
+ const base::android::JavaRef<jclass>& GetSafeAnnotationClass() override {
return safe_annotation_class_;
}
@@ -55,9 +53,9 @@ class NullDispatcherDelegate
public:
NullDispatcherDelegate() {}
- virtual ~NullDispatcherDelegate() {}
+ ~NullDispatcherDelegate() override {}
- virtual JavaObjectWeakGlobalRef GetObjectWeakRef(
+ JavaObjectWeakGlobalRef GetObjectWeakRef(
GinJavaBoundObject::ObjectID object_id) override {
return JavaObjectWeakGlobalRef();
}
@@ -77,9 +75,9 @@ class CountingDispatcherDelegate
public:
CountingDispatcherDelegate() {}
- virtual ~CountingDispatcherDelegate() {}
+ ~CountingDispatcherDelegate() override {}
- virtual JavaObjectWeakGlobalRef GetObjectWeakRef(
+ JavaObjectWeakGlobalRef GetObjectWeakRef(
GinJavaBoundObject::ObjectID object_id) override {
counters_[object_id]++;
return JavaObjectWeakGlobalRef();
@@ -176,16 +174,15 @@ class ObjectIsGoneObjectDelegate : public NullObjectDelegate {
method_.reset(new JavaMethod(method_obj));
}
- virtual ~ObjectIsGoneObjectDelegate() {}
+ ~ObjectIsGoneObjectDelegate() override {}
- virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
- JNIEnv* env) override {
+ base::android::ScopedJavaLocalRef<jobject> GetLocalRef(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 {
+ const JavaMethod* FindMethod(const std::string& method_name,
+ size_t num_parameters) override {
return method_.get();
}
@@ -230,16 +227,15 @@ class MethodNotFoundObjectDelegate : public NullObjectDelegate {
public:
MethodNotFoundObjectDelegate() : find_method_called_(false) {}
- virtual ~MethodNotFoundObjectDelegate() {}
+ ~MethodNotFoundObjectDelegate() override {}
- virtual base::android::ScopedJavaLocalRef<jobject> GetLocalRef(
- JNIEnv* env) override {
+ base::android::ScopedJavaLocalRef<jobject> GetLocalRef(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 {
+ const JavaMethod* FindMethod(const std::string& method_name,
+ size_t num_parameters) override {
find_method_called_ = true;
return NULL;
}
@@ -282,15 +278,15 @@ class GetClassObjectDelegate : public MethodNotFoundObjectDelegate {
public:
GetClassObjectDelegate() : get_class_called_(false) {}
- virtual ~GetClassObjectDelegate() {}
+ ~GetClassObjectDelegate() override {}
- virtual const JavaMethod* FindMethod(const std::string& method_name,
- size_t num_parameters) override {
+ const JavaMethod* FindMethod(const std::string& method_name,
+ size_t num_parameters) override {
find_method_called_ = true;
return kFakeGetClass;
}
- virtual bool IsObjectGetClassMethod(const JavaMethod* method) override {
+ bool IsObjectGetClassMethod(const JavaMethod* method) override {
get_class_called_ = true;
return kFakeGetClass == method;
}
« no previous file with comments | « content/browser/android/java/gin_java_bridge_dispatcher_host.cc ('k') | content/browser/android/java/jni_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698