Skip to content

Commit

Permalink
No need to support old style dasher domains.
Browse files Browse the repository at this point in the history
BUG=137118
TEST=See unit tests, not called in any code yet


Review URL: https://chromiumcodereview.appspot.com/11185002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162184 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
rogerta@chromium.org committed Oct 16, 2012
1 parent e7837c1 commit 06c84e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions google_apis/gaia/gaia_auth_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ bool IsGaiaSignonRealm(const GURL& url) {
if (!url.SchemeIsSecure())
return false;

// Also check "https://www.google.com" to support old style dasher logins.
return url == GURL(GaiaUrls::GetInstance()->gaia_origin_url()) ||
url == GURL("https://www.google.com/");
return url == GURL(GaiaUrls::GetInstance()->gaia_origin_url());
}

} // namespace gaia
4 changes: 2 additions & 2 deletions google_apis/gaia/gaia_auth_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ TEST(GaiaAuthUtilTest, SanitizeExistingDomain) {
TEST(GaiaAuthUtilTest, IsGaiaSignonRealm) {
// Only https versions of Gaia URLs should be considered valid.
EXPECT_TRUE(IsGaiaSignonRealm(GURL("https://accounts.google.com/")));
EXPECT_TRUE(IsGaiaSignonRealm(GURL("https://www.google.com/")));
EXPECT_FALSE(IsGaiaSignonRealm(GURL("http://accounts.google.com/")));
EXPECT_FALSE(IsGaiaSignonRealm(GURL("http://www.google.com/")));

// Other Google URLs are not valid.
EXPECT_FALSE(IsGaiaSignonRealm(GURL("https://www.google.com/")));
EXPECT_FALSE(IsGaiaSignonRealm(GURL("http://www.google.com/")));
EXPECT_FALSE(IsGaiaSignonRealm(GURL("https://google.com/")));
EXPECT_FALSE(IsGaiaSignonRealm(GURL("https://mail.google.com/")));

Expand Down

0 comments on commit 06c84e4

Please sign in to comment.