Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / storage / browser / fileapi / local_file_util.cc

diff --git a/src/storage/browser/fileapi/local_file_util.cc b/src/storage/browser/fileapi/local_file_util.cc
index 19ce59e..27a1308 100644 (file)
--- a/src/storage/browser/fileapi/local_file_util.cc
+++ b/src/storage/browser/fileapi/local_file_util.cc
@@ -32,12 +32,12 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
         virtual_root_path_(virtual_root_path) {
   }
 
-  virtual ~LocalFileEnumerator() {}
+  ~LocalFileEnumerator() override {}
 
-  virtual base::FilePath Next() OVERRIDE;
-  virtual int64 Size() OVERRIDE;
-  virtual base::Time LastModifiedTime() OVERRIDE;
-  virtual bool IsDirectory() OVERRIDE;
+  base::FilePath Next() override;
+  int64 Size() override;
+  base::Time LastModifiedTime() override;
+  bool IsDirectory() override;
 
  private:
   base::FileEnumerator file_enum_;
@@ -139,13 +139,12 @@ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> LocalFileUtil::
   base::FilePath file_path;
   if (GetLocalFilePath(context, root_url, &file_path) !=
       base::File::FILE_OK) {
-    return make_scoped_ptr(new EmptyFileEnumerator)
-        .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
+    return make_scoped_ptr(new EmptyFileEnumerator);
   }
   return make_scoped_ptr(new LocalFileEnumerator(
-      file_path, root_url.path(),
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
-      .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
+      file_path,
+      root_url.path(),
+      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES));
 }
 
 base::File::Error LocalFileUtil::GetLocalFilePath(