Fix chrome upload with content uri

base/file_util_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 2301 matching lines @@
       file_util::VerifyPathControlledByUser(
           base_dir_, sub_dir_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 }
 
+#if defined(OS_ANDROID)

[mmenke, 2013/11/07 16:31:55]

Test suggestion:  Test the case where we get an error when opening the file.

[mmenke, 2013/11/07 16:31:55]

Test suggestion:  I'd like a net test that uses a content URL successfully as
well (Don't think we really need the failure case tested in net/, though I
wouldn't object to it).

[qinmin, 2013/11/08 23:03:03]

Done.

[qinmin, 2013/11/08 23:03:03]

added a test in net/ for file_stream.
On 2013/11/07 16:31:55, mmenke wrote:

+TEST_F(FileUtilTest, ContentUriTest) {
+  // Get the test image path.
+  FilePath data_dir;
+  ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir));
+  data_dir = data_dir.AppendASCII("file_util");
+  ASSERT_TRUE(base::PathExists(data_dir));
+  FilePath image_file = data_dir.Append(FILE_PATH_LITERAL("red.png"));
+
+  // Insert the image into MediaStore. MediaStore will do some conversions, and
+  // return the content URI.
+  base::FilePath path = file_util::InsertImageIntoMediaStore(image_file);
+  EXPECT_TRUE(path.IsContentUri());
+  EXPECT_TRUE(base::PathExists(path));
+  // The file size may not equal to the input image as MediaStore may convert
+  // the image.
+  int64 size;
+  file_util::GetFileSize(path, &size);
+  EXPECT_LT(0, size);

[mmenke, 2013/11/07 16:31:55]

Suggest reading a non-zero size file and checking its contents.  Could
optionally do it in another test, just so we have the empty file case covered as
well.

[qinmin, 2013/11/08 23:03:03]

The android mediastore won't accept empty file. Added a comparison of the
original file size to the content uri size.

On 2013/11/07 16:31:55, mmenke wrote:

+
+  // We should be able to read the file.
+  char* buffer = new char[size];
+  EXPECT_EQ(-1, file_util::ReadFile(path, buffer, size));
+}
+#endif
+
 #endif  // defined(OS_POSIX)
 
 }  // namespace