diff options
| author | jamiewalch <jamiewalch@chromium.org> | 2016-02-25 19:10:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 03:11:54 +0000 |
| commit | 89668d82173d504b283963eb6e49d01a0a221222 (patch) | |
| tree | 5f0c0a2c4f08e6a69de0091179bc29bb627932ce | |
| parent | 9f9d842c7a501f7a993f5bee61706c8fef1ac457 (diff) | |
| download | chromium_src-89668d82173d504b283963eb6e49d01a0a221222.zip chromium_src-89668d82173d504b283963eb6e49d01a0a221222.tar.gz chromium_src-89668d82173d504b283963eb6e49d01a0a221222.tar.bz2 | |
Fix MANUAL_Auth test.
The failure is caused by two things:
* The flaky test is probably caused by the same bug as fixed in https://codereview.chromium.org/1724613002/ -- I just missed a call-site in fixing that.
* The consistent failure on my machine is caused by current Chrome builds appending a #ref to the sign-in URL, which was not being ignored when waiting for the page to load.
BUG=587704
Review URL: https://codereview.chromium.org/1729683006
Cr-Commit-Position: refs/heads/master@{#377793}
| -rw-r--r-- | chrome/test/remoting/page_load_notification_observer.cc | 9 | ||||
| -rw-r--r-- | chrome/test/remoting/remote_desktop_browsertest.cc | 4 |
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); |