Do not display lock for hosted domains

chrome/browser/profiles/profile_downloader_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_downloader.h"
 
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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;
 
   stream << "{ ";
   if (!full_name.empty()) {
     stream << "\"name\": \"" << full_name << "\"";
     started = true;
   }
   if (!given_name.empty()) {
     stream << (started ? ", " : "") << "\"given_name\": \"" << given_name
            << "\"";
     started = true;
   }
   if (!url.empty()) {
     stream << (started ? ", " : "") << "\"picture\": \"" << url << "\"";
     started = true;
   }
 
   if (!locale.empty())
     stream << (started ? ", " : "") << "\"locale\": \"" << locale << "\"";
 
-  stream << " }";
+  if (!hosted_domain.empty()) {
+    std::string trimmed_hosted_domain;
+    base::TrimString(hosted_domain, " ", &trimmed_hosted_domain);
+    stream << (started ? ", " : "") << "\"hd\": \"" << trimmed_hosted_domain
+           << "\"";
+  }
+
+  stream << " }";  DLOG(ERROR) << "stream";

[noms (inactive), 2014/09/15 20:24:39]

I spy with my little eye a leftover debug comment :)

[Mike Lerman, 2014/09/15 20:41:09]

Hehe you Found It!!

   return stream.str();
 }
 
 } // namespace
 
 class ProfileDownloaderTest : public testing::Test {
  protected:
   ProfileDownloaderTest() {
   }
 
   virtual ~ProfileDownloaderTest() {
   }
 
   void VerifyWithAccountData(const std::string& full_name,
                              const std::string& given_name,
                              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);
+    std::string trimmed_hosted_domain;

[noms (inactive), 2014/09/15 20:24:39]

Why do you need to trim this? Your code in gaia_info_... checks
hosted_domain.empty() without trimming, so your test should do the same. Pass a
std::string() on L161 rather than a space, and compare it here like the other
comparisons in L81-83. 

For that matter: what will your code do if hosted_domain == " " . Can that even
happen?

[Mike Lerman, 2014/09/15 20:41:09]

Done.

+    base::TrimString(hosted_domain, " ",
+                     &trimmed_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(trimmed_hosted_domain, parsed_hosted_domain_utf8);
   }
 };
 
 TEST_F(ProfileDownloaderTest, ParseData) {
   // URL without size specified.
   VerifyWithAccountData(
       "Pat Smith",
       "Pat",
       "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.
   VerifyWithAccountData(
       "Pat Smith",
       "Pat",
       "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.
   VerifyWithAccountData("Pat Smith",
                         "Pat",
                         "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
                         "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
                         "en-US",
+                        "google.com",
                         true);
 
   // Try different locales. URL with size specified.
   VerifyWithAccountData(
       "Pat Smith",
       "Pat",
       "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.
   VerifyWithAccountData("Pat Smith",
                         "Pat",
                         "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
                         "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(),
+                        std::string(),
+                        std::string(),
+                        std::string(),
+                        true);
+
+  // Data with only name and a blank but present hosted domain.
+  VerifyWithAccountData("Pat Smith",
+                        "Pat",
+                        std::string(),
+                        std::string(),
+                        std::string(),
+                        " ",
+                        true);
 
   // Data with only URL.
   VerifyWithAccountData(
       std::string(),
       std::string(),
       "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(),
+                        std::string(),
+                        std::string(),
+                        "fr",
+                        std::string(),
+                        false);
 
   // Data without name or URL or locale.
   VerifyWithAccountData(std::string(),
                         std::string(),
                         std::string(),
                         std::string(),
                         std::string(),
+                        std::string(),
                         false);
 
   // Data with an invalid URL.
   VerifyWithAccountData(std::string(),
                         std::string(),
                         "invalid url",
                         std::string(),
                         std::string(),
+                        std::string(),
                         false);
 }
 
 TEST_F(ProfileDownloaderTest, DefaultURL) {
   // Empty URL should be default photo
   EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL(std::string()));
   // Picasa default photo
   EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAA/AAAAAAAAAAE/G/s64-c/photo.jpg"));
   // Not default G+ photo
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAAAA/G/photo.jpg"));
   // Not default with 6 components
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg"));
   // Not default with 7 components
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg"));
 }