summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/test/remoting/page_load_notification_observer.cc9
-rw-r--r--chrome/test/remoting/remote_desktop_browsertest.cc4
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/test/remoting/page_load_notification_observer.cc b/chrome/test/remoting/page_load_notification_observer.cc
index 3236c7d..953a5df 100644
--- a/chrome/test/remoting/page_load_notification_observer.cc
+++ b/chrome/test/remoting/page_load_notification_observer.cc
@@ -29,10 +29,11 @@ bool PageLoadNotificationObserver::IsTargetLoaded() {
GURL current_url = controller->GetWebContents()->GetURL();
bool result = false;
if (ignore_url_parameters_) {
- GURL::Replacements strip_query;
- strip_query.ClearQuery();
- result = current_url.ReplaceComponents(strip_query) ==
- target_.ReplaceComponents(strip_query);
+ GURL::Replacements strip_parameters;
+ strip_parameters.ClearQuery();
+ strip_parameters.ClearRef();
+ result = current_url.ReplaceComponents(strip_parameters) ==
+ target_.ReplaceComponents(strip_parameters);
} else {
result = current_url == target_;
}
diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index da6b6fa..ac54a19 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -264,8 +264,8 @@ void RemoteDesktopBrowserTest::Authorize() {
observer.Wait();
content::NavigationController* controller =
- content::Source<content::NavigationController>(observer.source()).ptr();
-
+ content::Source<content::NavigationController>(
+ observer.matched_source()).ptr();
content::WebContents* web_contents = controller->GetWebContents();
_ASSERT_TRUE(web_contents);