OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 79 |
80 DISALLOW_COPY_AND_ASSIGN(ScreenshotTracker); | 80 DISALLOW_COPY_AND_ASSIGN(ScreenshotTracker); |
81 }; | 81 }; |
82 | 82 |
83 class WebContentsViewAuraTest : public ContentBrowserTest { | 83 class WebContentsViewAuraTest : public ContentBrowserTest { |
84 public: | 84 public: |
85 WebContentsViewAuraTest() | 85 WebContentsViewAuraTest() |
86 : screenshot_manager_(NULL) { | 86 : screenshot_manager_(NULL) { |
87 } | 87 } |
88 | 88 |
| 89 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 90 command_line->AppendSwitchASCII(switches::kOverscrollHistoryNavigation, |
| 91 std::string("1")); |
| 92 } |
| 93 |
89 // Executes the javascript synchronously and makes sure the returned value is | 94 // Executes the javascript synchronously and makes sure the returned value is |
90 // freed properly. | 95 // freed properly. |
91 void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) { | 96 void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) { |
92 scoped_ptr<base::Value> value = | 97 scoped_ptr<base::Value> value = |
93 content::ExecuteScriptAndGetValue(rvh, jscript); | 98 content::ExecuteScriptAndGetValue(rvh, jscript); |
94 } | 99 } |
95 | 100 |
96 // Starts the test server and navigates to the given url. Sets a large enough | 101 // Starts the test server and navigates to the given url. Sets a large enough |
97 // size to the root window. Returns after the navigation to the url is | 102 // size to the root window. Returns after the navigation to the url is |
98 // complete. | 103 // complete. |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
586 10); | 591 10); |
587 string16 actual_title = title_watcher.WaitAndGetTitle(); | 592 string16 actual_title = title_watcher.WaitAndGetTitle(); |
588 EXPECT_EQ(expected_title, actual_title); | 593 EXPECT_EQ(expected_title, actual_title); |
589 | 594 |
590 EXPECT_EQ(2, GetCurrentIndex()); | 595 EXPECT_EQ(2, GetCurrentIndex()); |
591 EXPECT_TRUE(controller.CanGoBack()); | 596 EXPECT_TRUE(controller.CanGoBack()); |
592 EXPECT_FALSE(controller.CanGoForward()); | 597 EXPECT_FALSE(controller.CanGoForward()); |
593 } | 598 } |
594 | 599 |
595 } // namespace content | 600 } // namespace content |
OLD | NEW |