Cleanup: Add fileapi::GetIsolatedFileSystemRootURIString

chrome/renderer/extensions/file_system_natives.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/extensions/file_system_natives.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
   WebKit::WebFrame* webframe = WebKit::WebFrame::frameForCurrentContext();
   DCHECK(webframe);
 
   GURL context_url =
       extensions::UserScriptSlave::GetDataSourceURLForFrame(webframe);
   CHECK(context_url.SchemeIs(extensions::kExtensionScheme));
 
   std::string name(fileapi::GetIsolatedFileSystemName(context_url.GetOrigin(),
                                                       file_system_id));
 
-  std::string root(fileapi::GetFileSystemRootURI(
-          context_url.GetOrigin(),
-          fileapi::kFileSystemTypeIsolated).spec());
-  root.append(file_system_id);
-  root.append("/");
-
   // The optional second argument is the subfolder within the isolated file
   // system at which to root the DOMFileSystem we're returning to the caller.
+  std::string optional_root_name;
   if (args.Length() == 2) {
     DCHECK(args[1]->IsString());
-    name = *v8::String::Utf8Value(args[1]);
-    root.append(name);
-    root.append("/");
+    optional_root_name = *v8::String::Utf8Value(args[1]);
   }
 
+  std::string root(fileapi::GetIsolatedFileSystemRootURIString(
+      context_url.GetOrigin(),
+      file_system_id,
+      optional_root_name));
+
   return webframe->createFileSystem(
       WebKit::WebFileSystem::TypeIsolated,
       WebKit::WebString::fromUTF8(name),
       WebKit::WebString::fromUTF8(root));
 }
 
 }  // namespace
 
 namespace extensions {
 
 FileSystemNatives::FileSystemNatives()
     : ChromeV8Extension(NULL) {
   RouteStaticFunction("GetIsolatedFileSystem", &GetIsolatedFileSystem);
 }
 
 }  // namespace extensions