Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: chrome/browser/signin/signin_browsertest.cc

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix for unit_tests Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_ 5 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
6 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_ 6 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/signin/chrome_signin_client.h" 9 #include "chrome/browser/signin/chrome_signin_client.h"
10 #include "chrome/browser/signin/chrome_signin_client_factory.h" 10 #include "chrome/browser/signin/chrome_signin_client_factory.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 class BackOnNTPCommitObserver : public content::WebContentsObserver { 180 class BackOnNTPCommitObserver : public content::WebContentsObserver {
181 public: 181 public:
182 explicit BackOnNTPCommitObserver(content::WebContents* web_contents) 182 explicit BackOnNTPCommitObserver(content::WebContents* web_contents)
183 : content::WebContentsObserver(web_contents) { 183 : content::WebContentsObserver(web_contents) {
184 } 184 }
185 185
186 virtual void DidCommitProvisionalLoadForFrame( 186 virtual void DidCommitProvisionalLoadForFrame(
187 content::RenderFrameHost* render_frame_host, 187 content::RenderFrameHost* render_frame_host,
188 const GURL& url, 188 const GURL& url,
189 bool url_is_unreachable,
189 ui::PageTransition transition_type) OVERRIDE { 190 ui::PageTransition transition_type) OVERRIDE {
190 if (url == GURL(chrome::kChromeUINewTabURL) || 191 if (url == GURL(chrome::kChromeUINewTabURL) ||
191 url == GURL(chrome::kChromeSearchLocalNtpUrl)) { 192 url == GURL(chrome::kChromeSearchLocalNtpUrl)) {
192 content::WindowedNotificationObserver observer( 193 content::WindowedNotificationObserver observer(
193 content::NOTIFICATION_NAV_ENTRY_COMMITTED, 194 content::NOTIFICATION_NAV_ENTRY_COMMITTED,
194 content::NotificationService::AllSources()); 195 content::NotificationService::AllSources());
195 web_contents()->GetController().GoBack(); 196 web_contents()->GetController().GoBack();
196 observer.Wait(); 197 observer.Wait();
197 } 198 }
198 } 199 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL()); 242 EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL());
242 EXPECT_EQ(start_url, web_contents->GetVisibleURL()); 243 EXPECT_EQ(start_url, web_contents->GetVisibleURL());
243 244
244 content::WindowedNotificationObserver observer( 245 content::WindowedNotificationObserver observer(
245 content::NOTIFICATION_LOAD_STOP, 246 content::NOTIFICATION_LOAD_STOP,
246 content::NotificationService::AllSources()); 247 content::NotificationService::AllSources());
247 observer.Wait(); 248 observer.Wait();
248 EXPECT_EQ(start_url, web_contents->GetLastCommittedURL()); 249 EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
249 } 250 }
250 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_ 251 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698