| Index: content/renderer/java/gin_java_bridge_dispatcher.h
|
| diff --git a/content/renderer/java/gin_java_bridge_dispatcher.h b/content/renderer/java/gin_java_bridge_dispatcher.h
|
| index 05e1427e0030e4ebced95b15d48c3046cecd973f..f795c288f7842ca9cfcc35e84f8f2931e851fad4 100644
|
| --- a/content/renderer/java/gin_java_bridge_dispatcher.h
|
| +++ b/content/renderer/java/gin_java_bridge_dispatcher.h
|
| @@ -6,11 +6,11 @@
|
| #define CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/id_map.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/values.h"
|
| #include "content/common/android/gin_java_bridge_errors.h"
|
| @@ -50,10 +50,11 @@ class GinJavaBridgeDispatcher
|
|
|
| void GetJavaMethods(ObjectID object_id, std::set<std::string>* methods);
|
| bool HasJavaMethod(ObjectID object_id, const std::string& method_name);
|
| - scoped_ptr<base::Value> InvokeJavaMethod(ObjectID object_id,
|
| - const std::string& method_name,
|
| - const base::ListValue& arguments,
|
| - GinJavaBridgeError* error);
|
| + std::unique_ptr<base::Value> InvokeJavaMethod(
|
| + ObjectID object_id,
|
| + const std::string& method_name,
|
| + const base::ListValue& arguments,
|
| + GinJavaBridgeError* error);
|
| GinJavaBridgeObject* GetObject(ObjectID object_id);
|
| void OnGinJavaBridgeObjectDeleted(GinJavaBridgeObject* object);
|
|
|
|
|