chrome/browser/profiles/profile_downloader_unittest.cc - Issue 566933005: Do not display lock for hosted domains

Unified Diff: chrome/browser/profiles/profile_downloader_unittest.cc

Issue 566933005: Do not display lock for hosted domains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_downloader.h ('K') | « chrome/browser/profiles/profile_downloader.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_downloader_unittest.cc

diff --git a/chrome/browser/profiles/profile_downloader_unittest.cc b/chrome/browser/profiles/profile_downloader_unittest.cc

index 3761c77ef2a8cbf0057de3d9198cc4930f975c9a..5e8c5ecbef6f07fa5438a79b0b79b5767d9a2de6 100644

--- a/chrome/browser/profiles/profile_downloader_unittest.cc

+++ b/chrome/browser/profiles/profile_downloader_unittest.cc

@@ -12,7 +12,8 @@ namespace {

std::string GetJSonData(const std::string& full_name,

const std::string& given_name,

const std::string& url,

- const std::string& locale) {

+ const std::string& locale,

+ const std::string& hosted_domain) {

std::stringstream stream;

bool started = false;

@@ -34,6 +35,9 @@ std::string GetJSonData(const std::string& full_name,

if (!locale.empty())

stream << (started ? ", " : "") << "\"locale\": \"" << locale << "\"";

+ if (!hosted_domain.empty())

+ stream << (started ? ", " : "") << "\"hd\": \"" << hosted_domain << "\"";

stream << " }";

return stream.str();

}

@@ -53,26 +57,32 @@ class ProfileDownloaderTest : public testing::Test {

const std::string& url,

const std::string& expected_url,

const std::string& locale,

+ const std::string& hosted_domain,

bool is_valid) {

base::string16 parsed_full_name;

base::string16 parsed_given_name;

std::string parsed_url;

std::string parsed_locale;

+ base::string16 parsed_hosted_domain;

bool result = ProfileDownloader::ParseProfileJSON(

- GetJSonData(full_name, given_name, url, locale),

+ GetJSonData(full_name, given_name, url, locale, hosted_domain),

&parsed_full_name,

&parsed_given_name,

&parsed_url,

32,

- &parsed_locale);

+ &parsed_locale,

+ &parsed_hosted_domain);

EXPECT_EQ(is_valid, result);

std::string parsed_full_name_utf8 = base::UTF16ToUTF8(parsed_full_name);

std::string parsed_given_name_utf8 = base::UTF16ToUTF8(parsed_given_name);

+ std::string parsed_hosted_domain_utf8 =

+ base::UTF16ToUTF8(parsed_hosted_domain);

EXPECT_EQ(full_name, parsed_full_name_utf8);

EXPECT_EQ(given_name, parsed_given_name_utf8);

EXPECT_EQ(expected_url, parsed_url);

EXPECT_EQ(locale, parsed_locale);

+ EXPECT_EQ(hosted_domain, parsed_hosted_domain_utf8);

}

};

@@ -84,6 +94,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg",

"https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg",

"en-US",

+ "google.com",

true);

// URL with size specified.

@@ -93,6 +104,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s64-c/1234567890.jpg",

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s32-c/1234567890.jpg",

"en-US",

+ "google.com",

true);

// URL with unknown format.

@@ -101,6 +113,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",

"en-US",

+ "google.com",

true);

// Try different locales. URL with size specified.

@@ -110,6 +123,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s64-c/1234567890.jpg",

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s32-c/1234567890.jpg",

"jp",

+ "google.com",

true);

// URL with unknown format.

@@ -118,11 +132,17 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",

"fr",

+ "",

true);

// Data with only name.

- VerifyWithAccountData(

- "Pat Smith", "Pat", std::string(), std::string(), std::string(), true);

+ VerifyWithAccountData("Pat Smith",

+ "Pat",

+ std::string(),

+ true);

noms (inactive) 2014/09/15 18:52:40 Maybe add a test for when the hosted domain is emp

Mike Lerman 2014/09/15 19:51:41 Adding in trim functionality so I can achieve this

// Data with only URL.

VerifyWithAccountData(

@@ -131,11 +151,17 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg",

"https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg",

std::string(),

+ std::string(),

true);

// Data with only locale.

- VerifyWithAccountData(

- std::string(), std::string(), std::string(), std::string(), "fr", false);

+ VerifyWithAccountData(std::string(),

+ std::string(),

+ "fr",

+ std::string(),

+ false);

// Data without name or URL or locale.

VerifyWithAccountData(std::string(),

@@ -143,6 +169,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

std::string(),

+ std::string(),

false);

// Data with an invalid URL.

@@ -151,6 +178,7 @@ TEST_F(ProfileDownloaderTest, ParseData) {

"invalid url",

std::string(),

+ std::string(),

false);

}