Commit 9029a43f authored by limasdf's avatar limasdf Committed by Commit bot

Remove linked_ptr from gin_java_base_object.h/cc

BUG=556939

Review-Url: https://codereview.chromium.org/2430803003
Cr-Commit-Position: refs/heads/master@{#427059}
parent c30dd018
......@@ -183,8 +183,8 @@ void GinJavaBoundObject::EnsureMethodsAreSetUp() {
continue;
}
JavaMethod* method = new JavaMethod(java_method);
methods_.insert(std::make_pair(method->name(), make_linked_ptr(method)));
std::unique_ptr<JavaMethod> method(new JavaMethod(java_method));
methods_.insert(std::make_pair(method->name(), std::move(method)));
}
}
......
......@@ -9,11 +9,11 @@
#include <stdint.h>
#include <map>
#include <memory>
#include <set>
#include "base/android/jni_weak_ref.h"
#include "base/android/scoped_java_ref.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/values.h"
#include "content/browser/android/java/java_method.h"
......@@ -79,7 +79,7 @@ class GinJavaBoundObject
std::set<int32_t> holders_;
// The following fields are accessed on the background thread.
typedef std::multimap<std::string, linked_ptr<JavaMethod> > JavaMethodMap;
using JavaMethodMap = std::multimap<std::string, std::unique_ptr<JavaMethod>>;
JavaMethodMap methods_;
jmethodID object_get_class_method_id_;
bool are_methods_set_up_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment