Fix: file permissions when restoring a page with file inputs with selected files.

webkit/glue/glue_serialize_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 <string>
 
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
@@ skipping 263 matching lines @@
   item.setHTTPBody(http_body);
 
   std::string serialized_item = webkit_glue::HistoryItemToString(item);
   const std::vector<FilePath>& file_paths =
       webkit_glue::FilePathsFromHistoryState(serialized_item);
   ASSERT_EQ(2U, file_paths.size());
   EXPECT_EQ(file_path1, file_paths[0]);
   EXPECT_EQ(file_path2, file_paths[1]);
 }
 
+TEST_F(GlueSerializeTest, FilePathsFromInputsInHistoryState) {
+  WebHistoryItem item;
+  item.initialize();
+
+  FilePath file_path_bad(FILE_PATH_LITERAL("bad-file.txt"));
+  FilePath file_path_good(FILE_PATH_LITERAL("good-file.txt"));
+  WebVector<WebString> document_state(size_t(13));
+  document_state[0] = WebString::fromUTF8(
+      "something and WebKit serialized form state version 5 and more");
+  document_state[1] = WebString::fromUTF8("name1");
+  document_state[2] = WebString::fromUTF8("not-a-file");  // control type
+  document_state[3] = WebString::fromUTF8("key");
+  document_state[4] = WebString::fromUTF8("2");
+  document_state[5] = webkit_glue::FilePathToWebString(file_path_bad);
+  document_state[6] = WebString::fromUTF8("filename");
+
+  document_state[7] = WebString::fromUTF8("name2");
+  document_state[8] = WebString::fromUTF8("file");  // control type
+  document_state[9] = WebString::fromUTF8("key");
+  document_state[10] = WebString::fromUTF8("2");
+  document_state[11] = webkit_glue::FilePathToWebString(file_path_good);
+  document_state[12] = WebString::fromUTF8("filename");
+  item.setDocumentState(document_state);
+
+  std::string serialized_item = webkit_glue::HistoryItemToString(item);
+  const std::vector<FilePath>& file_paths =
+      webkit_glue::FilePathsFromInputsInHistoryState(serialized_item);
+  ASSERT_EQ(1U, file_paths.size());
+  EXPECT_EQ(file_path_good, file_paths[0]);
+}
+
 // Makes sure that a HistoryItem containing password data remains intact after
 // being serialized and deserialized.
 TEST_F(GlueSerializeTest, HistoryItemWithPasswordsSerializeTest) {
   const WebHistoryItem& item = MakeHistoryItemWithPasswordData(true);
   const std::string& serialized_item = webkit_glue::HistoryItemToString(item);
   const WebHistoryItem& deserialized_item =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item.isNull());
   ASSERT_FALSE(deserialized_item.isNull());
@@ skipping 36 matching lines @@
 
   ASSERT_FALSE(item1.isNull());
   ASSERT_FALSE(item2.isNull());
 
   // Form data was not removed.
   HistoryItemExpectEqual(item1, item2,
                          webkit_glue::HistoryItemCurrentVersion());
 }
 
 }  // namespace