Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / local / local_file_change_tracker_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc b/src/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
index cada3cb..ca6389e 100644 (file)
--- a/src/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
+++ b/src/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
@@ -19,15 +19,15 @@
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "content/public/test/mock_blob_url_request_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/quota/quota_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/quota/quota_manager.h"
 
-using fileapi::FileSystemContext;
-using fileapi::FileSystemURL;
-using fileapi::FileSystemURLSet;
+using storage::FileSystemContext;
+using storage::FileSystemURL;
+using storage::FileSystemURLSet;
 using content::MockBlobURLRequestContext;
 using content::ScopedTextBlob;
 
@@ -106,7 +106,7 @@ class LocalFileChangeTrackerTest : public testing::Test {
     change_tracker()->CollectLastDirtyChanges(file_system_context());
   }
 
-  void GetAllChangedURLs(fileapi::FileSystemURLSet* urls) {
+  void GetAllChangedURLs(storage::FileSystemURLSet* urls) {
     change_tracker()->GetAllChangedURLs(urls);
   }
 
@@ -565,7 +565,7 @@ TEST_F(LocalFileChangeTrackerTest, RestoreMoveChanges) {
   file_system_.GetChangedURLsInTracker(&urls);
   // Deletion for child files in the deleted directory cannot be restored,
   // so we will only have 8 changes.
-  EXPECT_EQ(8U, urls.size());
+  EXPECT_EQ(10U, urls.size());
 
   VerifyAndClearChange(URL(kPath0),
                        FileChange(FileChange::FILE_CHANGE_DELETE,