| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <set> | 5 #include <set> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 } | 1555 } |
| 1556 | 1556 |
| 1557 bool file_chosen() { return file_chosen_; } | 1557 bool file_chosen() { return file_chosen_; } |
| 1558 | 1558 |
| 1559 private: | 1559 private: |
| 1560 base::FilePath file_; | 1560 base::FilePath file_; |
| 1561 bool file_chosen_; | 1561 bool file_chosen_; |
| 1562 }; | 1562 }; |
| 1563 | 1563 |
| 1564 // Test for http://crbug.com/262948. | 1564 // Test for http://crbug.com/262948. |
| 1565 // Flaky on Mac. http://crbug.com/452018 |
| 1566 #if defined(OS_MACOSX) |
| 1567 #define MAYBE_RestoreFileAccessForHistoryNavigation \ |
| 1568 DISABLED_RestoreFileAccessForHistoryNavigation |
| 1569 #else |
| 1570 #define MAYBE_RestoreFileAccessForHistoryNavigation \ |
| 1571 RestoreFileAccessForHistoryNavigation |
| 1572 #endif |
| 1565 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, | 1573 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, |
| 1566 RestoreFileAccessForHistoryNavigation) { | 1574 MAYBE_RestoreFileAccessForHistoryNavigation) { |
| 1567 StartServer(); | 1575 StartServer(); |
| 1568 base::FilePath file; | 1576 base::FilePath file; |
| 1569 EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &file)); | 1577 EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &file)); |
| 1570 file = file.AppendASCII("bar"); | 1578 file = file.AppendASCII("bar"); |
| 1571 | 1579 |
| 1572 // Navigate to url and get it to reference a file in its PageState. | 1580 // Navigate to url and get it to reference a file in its PageState. |
| 1573 GURL url1(test_server()->GetURL("files/file_input.html")); | 1581 GURL url1(test_server()->GetURL("files/file_input.html")); |
| 1574 NavigateToURL(shell(), url1); | 1582 NavigateToURL(shell(), url1); |
| 1575 int process_id = shell()->web_contents()->GetRenderProcessHost()->GetID(); | 1583 int process_id = shell()->web_contents()->GetRenderProcessHost()->GetID(); |
| 1576 scoped_ptr<FileChooserDelegate> delegate(new FileChooserDelegate(file)); | 1584 scoped_ptr<FileChooserDelegate> delegate(new FileChooserDelegate(file)); |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1664 back_nav_load_observer.Wait(); | 1672 back_nav_load_observer.Wait(); |
| 1665 EXPECT_NE(process_id, | 1673 EXPECT_NE(process_id, |
| 1666 shell()->web_contents()->GetRenderProcessHost()->GetID()); | 1674 shell()->web_contents()->GetRenderProcessHost()->GetID()); |
| 1667 | 1675 |
| 1668 // Ensure that the file access still exists in the new process ID. | 1676 // Ensure that the file access still exists in the new process ID. |
| 1669 EXPECT_TRUE(ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( | 1677 EXPECT_TRUE(ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( |
| 1670 shell()->web_contents()->GetRenderProcessHost()->GetID(), file)); | 1678 shell()->web_contents()->GetRenderProcessHost()->GetID(), file)); |
| 1671 } | 1679 } |
| 1672 | 1680 |
| 1673 } // namespace content | 1681 } // namespace content |
| OLD | NEW |