[fsp] Cleanup handling errors for operation requests.

chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 160 matching lines @@
       false /* create */,
       base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(open_file.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, OnSuccess) {
-  using extensions::api::file_system_provider_internal::
-      OpenFileRequestedSuccess::Params;
-
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   OpenFile open_file(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kFilePath),
       ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
       false /* create */,
       base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(open_file.Execute(kRequestId));
 
   open_file.OnSuccess(kRequestId,
                       scoped_ptr<RequestValue>(new RequestValue()),
                       false /* has_more */);
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_OK, event->result());
   EXPECT_LT(0, event->file_handle());
 }
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, OnError) {
-  using extensions::api::file_system_provider_internal::OpenFileRequestedError::
-      Params;
-
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   OpenFile open_file(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kFilePath),
       ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
       false /* create */,
       base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(open_file.Execute(kRequestId));
 
-  open_file.OnError(kRequestId, base::File::FILE_ERROR_TOO_MANY_OPENED);
+  open_file.OnError(kRequestId,
+                    scoped_ptr<RequestValue>(new RequestValue()),
+                    base::File::FILE_ERROR_TOO_MANY_OPENED);
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result());
   ASSERT_EQ(0, event->file_handle());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos