| Index: content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
|
| diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
|
| index f06d9fe4aa04f58c6b8e4fb692af722a094f4160..02cf4dcc060b3e88020bf4f71b33c97f3255c16e 100644
|
| --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
|
| +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
|
| @@ -31,7 +31,7 @@ JavaBridgeDispatcherHostManager::~JavaBridgeDispatcherHostManager() {
|
| DCHECK_EQ(0U, instances_.size());
|
| }
|
|
|
| -void JavaBridgeDispatcherHostManager::AddNamedObject(const string16& name,
|
| +void JavaBridgeDispatcherHostManager::AddNamedObject(const base::string16& name,
|
| NPObject* object) {
|
| // Record this object in a map so that we can add it into RenderViewHosts
|
| // created later. The JavaBridgeDispatcherHost instances will take a
|
| @@ -67,7 +67,8 @@ void JavaBridgeDispatcherHostManager::SetRetainedObjectSet(
|
| }
|
| }
|
|
|
| -void JavaBridgeDispatcherHostManager::RemoveNamedObject(const string16& name) {
|
| +void JavaBridgeDispatcherHostManager::RemoveNamedObject(
|
| + const base::string16& name) {
|
| ObjectMap::iterator iter = objects_.find(name);
|
| if (iter == objects_.end()) {
|
| return;
|
|
|