Update to Chromium revision 614d31da (#423768)

- Fix PDF extension loading after showing the plugin placeholder (issue #2020)
This commit is contained in:
Marshall Greenblatt
2016-10-21 15:52:29 -04:00
parent 07d12b78e1
commit c9e81c082f
75 changed files with 725 additions and 502 deletions

View File

@@ -693,7 +693,7 @@ TEST(ResourceManagerTest, DirectoryProvider) {
EXPECT_TRUE(scoped_dir.CreateUniqueTempDir());
// Write the files to disk.
const base::FilePath& temp_dir = scoped_dir.path();
const base::FilePath& temp_dir = scoped_dir.GetPath();
WriteFile(temp_dir.AppendASCII(kFile1), CreateContents(success1_message));
WriteFile(temp_dir.AppendASCII(kFile2), CreateContents(success2_message));
@@ -750,7 +750,7 @@ TEST(ResourceManagerTest, ArchiveProvider) {
base::ScopedTempDir scoped_dir;
EXPECT_TRUE(scoped_dir.CreateUniqueTempDir());
const base::FilePath& temp_dir = scoped_dir.path();
const base::FilePath& temp_dir = scoped_dir.GetPath();
// Write the files to disk.
const base::FilePath& file_dir = temp_dir.AppendASCII("files");