Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / file_handlers / app_file_handler_util.cc

diff --git a/src/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc b/src/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
index f79af9f..d27ccac 100644 (file)
--- a/src/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
+++ b/src/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 
+#include "apps/browser/file_handler_util.h"
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ -20,6 +21,8 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #endif
 
+using apps::file_handler_util::GrantedFileEntry;
+
 namespace extensions {
 
 namespace app_file_handler_util {
@@ -175,7 +178,7 @@ void WritableFileChecker::Check() {
 WritableFileChecker::~WritableFileChecker() {}
 
 void WritableFileChecker::TaskDone() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (--outstanding_tasks_ == 0) {
     if (error_path_.empty())
       on_success_.Run();
@@ -193,7 +196,7 @@ void WritableFileChecker::Error(const base::FilePath& error_path) {
 }
 
 void WritableFileChecker::CheckLocalWritableFiles() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   std::string error;
   for (std::vector<base::FilePath>::const_iterator it = paths_.begin();
        it != paths_.end();
@@ -348,8 +351,6 @@ void CheckWritableFiles(
   checker->Check();
 }
 
-GrantedFileEntry::GrantedFileEntry() {}
-
 bool HasFileSystemWritePermission(const Extension* extension) {
   return extension->HasAPIPermission(APIPermission::kFileSystemWrite);
 }