Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.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.
 
 // File contains browser tests for the fileBrowserHandler api.
 
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/common/extension.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 namespace utils = extension_function_test_utils;
 
 using content::BrowserContext;
 using extensions::Extension;
 
 namespace {
 
 // Data that defines FileSelector behaviour in each test case.
 struct TestCase {
@@ skipping 130 matching lines @@
     // directory with an unique name.
     ASSERT_TRUE(scoped_tmp_dir_.CreateUniqueTempDir());
     tmp_mount_point_ = scoped_tmp_dir_.path().Append("tmp");
     base::CreateDirectory(tmp_mount_point_);
 
     ExtensionApiTest::SetUp();
   }
 
   // Creates new, test mount point.
   void AddTmpMountPoint(const std::string& extension_id) {
-    BrowserContext::GetMountPoints(browser()->profile())->RegisterFileSystem(
-        "tmp",
-        fileapi::kFileSystemTypeNativeLocal,
-        fileapi::FileSystemMountOption(),
-        tmp_mount_point_);
+    BrowserContext::GetMountPoints(browser()->profile())
+        ->RegisterFileSystem("tmp",
+                             storage::kFileSystemTypeNativeLocal,
+                             storage::FileSystemMountOption(),
+                             tmp_mount_point_);
   }
 
   base::FilePath GetFullPathOnTmpMountPoint(
       const base::FilePath& relative_path) {
     return tmp_mount_point_.Append(relative_path);
   }
 
   // Creates a new FileBrowserHandlerInternalSelectFileFunction to be used in
   // the test.  This function will be called from ExtensionFunctinoDispatcher
   // whenever an extension function for fileBrowserHandlerInternal.selectFile
@@ skipping 178 matching lines @@
           select_file_function.get(),
           "[{\"suggestedName\": \"/path_to_file/some_file_name.txt\"}]",
           browser())));
 
   EXPECT_FALSE(utils::GetBoolean(result.get(), "success"));
   base::DictionaryValue* entry_info;
   EXPECT_FALSE(result->GetDictionary("entry", &entry_info));
 }
 
 }  // namespace