| OLD | NEW |
| 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 13 matching lines...) Expand all Loading... |
| 24 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
| 25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 26 #include "content/public/browser/web_contents_observer.h" | 26 #include "content/public/browser/web_contents_observer.h" |
| 27 #include "content/public/common/content_switches.h" | 27 #include "content/public/common/content_switches.h" |
| 28 #include "google_apis/gaia/gaia_urls.h" | 28 #include "google_apis/gaia/gaia_urls.h" |
| 29 #include "net/http/http_status_code.h" | 29 #include "net/http/http_status_code.h" |
| 30 #include "net/url_request/test_url_fetcher_factory.h" | 30 #include "net/url_request/test_url_fetcher_factory.h" |
| 31 #include "net/url_request/url_request_status.h" | 31 #include "net/url_request/url_request_status.h" |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 const char kNonSigninURL[] = "www.google.com"; | 34 const char kNonSigninURL[] = "http://www.google.com"; |
| 35 } | 35 } |
| 36 | 36 |
| 37 class SigninBrowserTest : public InProcessBrowserTest { | 37 class SigninBrowserTest : public InProcessBrowserTest { |
| 38 public: | 38 public: |
| 39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 40 https_server_.reset(new net::SpawnedTestServer( | 40 https_server_.reset(new net::SpawnedTestServer( |
| 41 net::SpawnedTestServer::TYPE_HTTPS, | 41 net::SpawnedTestServer::TYPE_HTTPS, |
| 42 net::SpawnedTestServer::kLocalhost, | 42 net::SpawnedTestServer::kLocalhost, |
| 43 base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); | 43 base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); |
| 44 ASSERT_TRUE(https_server_->Start()); | 44 ASSERT_TRUE(https_server_->Start()); |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL()); | 237 EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL()); |
| 238 EXPECT_EQ(start_url, web_contents->GetVisibleURL()); | 238 EXPECT_EQ(start_url, web_contents->GetVisibleURL()); |
| 239 | 239 |
| 240 content::WindowedNotificationObserver observer( | 240 content::WindowedNotificationObserver observer( |
| 241 content::NOTIFICATION_LOAD_STOP, | 241 content::NOTIFICATION_LOAD_STOP, |
| 242 content::NotificationService::AllSources()); | 242 content::NotificationService::AllSources()); |
| 243 observer.Wait(); | 243 observer.Wait(); |
| 244 EXPECT_EQ(start_url, web_contents->GetLastCommittedURL()); | 244 EXPECT_EQ(start_url, web_contents->GetLastCommittedURL()); |
| 245 } | 245 } |
| 246 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_ | 246 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_ |
| OLD | NEW |