Use ArcFileSystemInstance to access files on ARC.

chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc

Index: chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
diff --git a/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc b/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
index 0fd80e0e8595b4b15006c6f7bc97bf2b8d3074d4..a7a61b8175b35385e960d791173d766a721b728f 100644
--- a/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
-#include "components/arc/test/fake_intent_helper_instance.h"
+#include "components/arc/test/fake_file_system_instance.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "net/base/io_buffer.h"
@@ -22,25 +22,25 @@ namespace {
 const char kArcUrl[] = "content://org.chromium.foo/bar";
 const char kData[] = "abcdefghijklmnopqrstuvwxyz";
 
-class ArcIntentHelperInstanceTestImpl : public FakeIntentHelperInstance {
+class ArcFileSystemInstanceTestImpl : public FakeFileSystemInstance {
  public:
-  explicit ArcIntentHelperInstanceTestImpl(const base::FilePath& file_path)
+  explicit ArcFileSystemInstanceTestImpl(const base::FilePath& file_path)
       : file_path_(file_path) {}
 
-  ~ArcIntentHelperInstanceTestImpl() override = default;
+  ~ArcFileSystemInstanceTestImpl() override = default;
 
-  void GetFileSize(const mojo::String& url,

[Yusuke Sato, 2016/11/18 19:21:05]

oops, please rebase on top of
https://chromium.googlesource.com/chromium/src/+/e6db796a2f93afe3913d9c84c176...
.

[Shuhei Takahashi, 2016/11/21 11:06:42]

Done.

+  void GetFileSize(const std::string& url,
                    const GetFileSizeCallback& callback) override {
-    EXPECT_EQ(kArcUrl, url.get());
+    EXPECT_EQ(kArcUrl, url);
     base::File::Info info;
     EXPECT_TRUE(base::GetFileInfo(file_path_, &info));
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, info.size));
   }
 
-  void OpenFileToRead(const mojo::String& url,
+  void OpenFileToRead(const std::string& url,
                       const OpenFileToReadCallback& callback) override {
-    EXPECT_EQ(kArcUrl, url.get());
+    EXPECT_EQ(kArcUrl, url);
 
     base::File file(file_path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
     EXPECT_TRUE(file.IsValid());
@@ -60,7 +60,7 @@ class ArcIntentHelperInstanceTestImpl : public FakeIntentHelperInstance {
  private:
   base::FilePath file_path_;
 
-  DISALLOW_COPY_AND_ASSIGN(ArcIntentHelperInstanceTestImpl);
+  DISALLOW_COPY_AND_ASSIGN(ArcFileSystemInstanceTestImpl);
 };
 
 class ArcContentFileSystemFileStreamReaderTest : public testing::Test {
@@ -77,16 +77,16 @@ class ArcContentFileSystemFileStreamReaderTest : public testing::Test {
     base::FilePath path = temp_dir_.GetPath().AppendASCII("bar");
     ASSERT_TRUE(base::WriteFile(path, kData, arraysize(kData)));
 
-    intent_helper_.reset(new ArcIntentHelperInstanceTestImpl(path));
+    file_system_.reset(new ArcFileSystemInstanceTestImpl(path));
 
-    fake_arc_bridge_service_.intent_helper()->SetInstance(intent_helper_.get());
+    fake_arc_bridge_service_.file_system()->SetInstance(file_system_.get());
   }
 
  private:
   base::ScopedTempDir temp_dir_;
   content::TestBrowserThreadBundle thread_bundle_;
   FakeArcBridgeService fake_arc_bridge_service_;
-  std::unique_ptr<ArcIntentHelperInstanceTestImpl> intent_helper_;
+  std::unique_ptr<ArcFileSystemInstanceTestImpl> file_system_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcContentFileSystemFileStreamReaderTest);
 };