Rename FileSystemMountPointProvider::ValidateFileSystemRoot to OpenFileSystem

chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 82 matching lines @@
     MessageLoop::current()->Run();
   }
 
   // Unblocks the current MessageLoop. Should be called in response to some sort
   // of async activity in a callback method.
   void Notify() {
     MessageLoop::current()->Quit();
   }
 
   // Callback that should be executed in response to
-  // fileapi::SandboxMountPointProvider::ValidateFileSystemRoot
-  void ValidateFileSystemCallback(base::PlatformFileError error) {
-    validate_file_system_result_ = error;
+  // fileapi::SandboxMountPointProvider::OpenFileSystem.
+  void OpenFileSystemCallback(base::PlatformFileError error) {
+    open_file_system_result_ = error;
     Notify();
   }
 
-  // Calls fileapi::SandboxMountPointProvider::ValidateFileSystemRootAndGetURL
+  // Calls fileapi::SandboxMountPointProvider::OpenFileSystem
   // to verify the existence of a file system for a specified type and origin,
   // blocks until a response is available, then returns the result
   // synchronously to it's caller.
   bool FileSystemContainsOriginAndType(const GURL& origin,
                                        fileapi::FileSystemType type) {
-    sandbox_->ValidateFileSystemRoot(
-        origin, type, false,
+    sandbox_->OpenFileSystem(
+        origin, type,
+        fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT,
         base::Bind(
-            &BrowsingDataFileSystemHelperTest::ValidateFileSystemCallback,
+            &BrowsingDataFileSystemHelperTest::OpenFileSystemCallback,
             base::Unretained(this)));
     BlockUntilNotified();
-    return validate_file_system_result_ == base::PLATFORM_FILE_OK;
+    return open_file_system_result_ == base::PLATFORM_FILE_OK;
   }
 
   // Callback that should be executed in response to StartFetching(), and stores
   // found file systems locally so that they are available via GetFileSystems().
   void CallbackStartFetching(
       const std::list<BrowsingDataFileSystemHelper::FileSystemInfo>&
           file_system_info_list) {
     file_system_info_list_.reset(
         new std::list<BrowsingDataFileSystemHelper::FileSystemInfo>(
             file_system_info_list));
@@ skipping 47 matching lines @@
   }
 
   // Returns a list of the FileSystemInfo objects gathered in the most recent
   // call to StartFetching().
   FileSystemInfoList* GetFileSystems() {
     return file_system_info_list_.get();
   }
 
 
   // Temporary storage to pass information back from callbacks.
-  base::PlatformFileError validate_file_system_result_;
+  base::PlatformFileError open_file_system_result_;
   ScopedFileSystemInfoList file_system_info_list_;
 
   scoped_refptr<BrowsingDataFileSystemHelper> helper_;
   scoped_refptr<CannedBrowsingDataFileSystemHelper> canned_helper_;
 
  private:
   // message_loop_, as well as all the threads associated with it must be
   // defined before profile_ to prevent explosions. The threads also must be
   // defined in the order they're listed here. Oh how I love C++.
   MessageLoopForUI message_loop_;
@@ skipping 114 matching lines @@
 // extension and devtools schemes.
 TEST_F(BrowsingDataFileSystemHelperTest, IgnoreExtensionsAndDevTools) {
   ASSERT_TRUE(canned_helper_->empty());
   canned_helper_->AddFileSystem(kOriginExt, kTemporary, 0);
   ASSERT_TRUE(canned_helper_->empty());
   canned_helper_->AddFileSystem(kOriginDevTools, kTemporary, 0);
   ASSERT_TRUE(canned_helper_->empty());
 }
 
 }  // namespace