| Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
|
| ===================================================================
|
| --- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc (revision 116288)
|
| +++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc (working copy)
|
| @@ -27,6 +27,7 @@
|
| #include "content/test/test_browser_thread.h"
|
|
|
| using content::BrowserThread;
|
| +using content::NavigationController;
|
| using content::WebContents;
|
|
|
| // A SafeBrowingService class that allows us to inject the malicious URLs.
|
| @@ -430,7 +431,7 @@
|
| ui_test_utils::NavigateToURL(browser(), url);
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| SendCommand("\"proceed\""); // Simulate the user clicking "proceed"
|
| @@ -462,7 +463,7 @@
|
|
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| SendCommand("\"proceed\""); // Simulate the user clicking "proceed".
|
| @@ -481,7 +482,7 @@
|
|
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| SendCommand("\"reportError\""); // Simulate the user clicking "report error"
|
| @@ -504,7 +505,7 @@
|
|
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| SendCommand("\"learnMore\""); // Simulate the user clicking "learn more"
|
| @@ -527,7 +528,7 @@
|
|
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_NAV_ENTRY_COMMITTED,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| SendCommand("\"takeMeBack\""); // Simulate the user clicking "back"
|
|
|