Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / extensions / common / xwalk_extension_server.cc

diff --git a/src/xwalk/extensions/common/xwalk_extension_server.cc b/src/xwalk/extensions/common/xwalk_extension_server.cc
index 1350bad..9bb4933 100644 (file)
--- a/src/xwalk/extensions/common/xwalk_extension_server.cc
+++ b/src/xwalk/extensions/common/xwalk_extension_server.cc
@@ -4,9 +4,9 @@
 
 #include "xwalk/extensions/common/xwalk_extension_server.h"
 
-#include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ -177,12 +177,9 @@ bool XWalkExtensionServer::RegisterExtension(
     return false;
   }
 
-  const base::ListValue& entry_points = extension->entry_points();
-  base::ListValue::const_iterator it = entry_points.begin();
+  const std::vector<std::string>& entry_points = extension->entry_points();
 
-  for (; it != entry_points.end(); ++it) {
-    std::string entry_point;
-    (*it)->GetAsString(&entry_point);
+  for (const std::string& entry_point : entry_points) {
     extension_symbols_.insert(entry_point);
   }
 
@@ -280,14 +277,8 @@ void XWalkExtensionServer::DeleteInstanceMap() {
 }
 
 bool XWalkExtensionServer::ValidateExtensionEntryPoints(
-    const base::ListValue& entry_points) {
-  base::ListValue::const_iterator it = entry_points.begin();
-
-  for (; it != entry_points.end(); ++it) {
-    std::string entry_point;
-
-    (*it)->GetAsString(&entry_point);
-
+    const std::vector<std::string>& entry_points) {
+  for (const std::string& entry_point : entry_points) {
     if (!ValidateExtensionIdentifier(entry_point))
       return false;
 
@@ -357,11 +348,8 @@ void XWalkExtensionServer::OnGetExtensions(
     extension_parameters.name = extension->name();
     extension_parameters.js_api = extension->javascript_api();
 
-    const base::ListValue& entry_points = extension->entry_points();
-    base::ListValue::const_iterator entry_it = entry_points.begin();
-    for (; entry_it != entry_points.end(); ++entry_it) {
-      std::string entry_point;
-      (*entry_it)->GetAsString(&entry_point);
+    const std::vector<std::string>& entry_points = extension->entry_points();
+    for (const std::string& entry_point : entry_points) {
       extension_parameters.entry_points.push_back(entry_point);
     }
 
@@ -418,7 +406,7 @@ std::vector<std::string> RegisterExternalExtensionsInDirectory(
       extension->set_permissions_delegate(server->permissions_delegate());
     if (extension->Initialize()) {
       registered_extensions.push_back(extension->name());
-      server->RegisterExtension(extension.PassAs<XWalkExtension>());
+      server->RegisterExtension(extension.Pass());
     } else {
       LOG(WARNING) << "Failed to initialize extension: "
                    << extension_path.AsUTF8Unsafe();