contacts: Strip Unicode byte order marks from strings.

chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc

 // Copyright (c) 2012 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/chromeos/gdata/gdata_contacts_service.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 151 matching lines @@
   EXPECT_FALSE(Download("not_json.txt", base::Time(), &contacts));
   EXPECT_FALSE(Download("not_dictionary.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("no_feed.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("no_category.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("wrong_category.json", base::Time(), &contacts));
 
   // Missing photos should be allowed, though (as this can occur in production).
   EXPECT_TRUE(Download("feed_photo_404.json", base::Time(), &contacts));
   ASSERT_EQ(static_cast<size_t>(1), contacts->size());
   EXPECT_FALSE((*contacts)[0]->has_raw_untrusted_photo());
-}
 
-// We should report failure when we're unable to download the contact group
-// feed.
-IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, MissingGroupsFeed) {
-  scoped_ptr<ScopedVector<contacts::Contact> > contacts;
+  // We should report failure when we're unable to download the contact group
+  // feed.
+  service_->clear_cached_my_contacts_group_id_for_testing();
   service_->set_groups_feed_url_for_testing(
       test_server_.GetURL(std::string(kFeedBaseUrl) + "404"));
   EXPECT_FALSE(Download("feed.json", base::Time(), &contacts));
   EXPECT_TRUE(service_->cached_my_contacts_group_id_for_testing().empty());
-}
 
-// We should also fail when the "My Contacts" group isn't listed in the group
-// feed.
-IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, NoMyContactsGroup) {
-  scoped_ptr<ScopedVector<contacts::Contact> > contacts;
+  // We should also fail when the "My Contacts" group isn't listed in the group
+  // feed.
+  service_->clear_cached_my_contacts_group_id_for_testing();
   service_->set_groups_feed_url_for_testing(
       test_server_.GetURL(std::string(kFeedBaseUrl) +
                           "groups_no_my_contacts.json"));
   EXPECT_FALSE(Download("feed.json", base::Time(), &contacts));
   EXPECT_TRUE(service_->cached_my_contacts_group_id_for_testing().empty());
 }
 
 // Check that we're able to download an empty feed and a normal-looking feed
 // with two regular contacts and one deleted one.
 IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, Download) {
@@ skipping 87 matching lines @@
     InitContact(base::StringPrintf("http://example.com/%d", i + 1),
                 "2012-06-04T15:53:36.023Z",
                 false, "", "", "", "", "", "", contact);
     contacts::test::SetPhoto(gfx::Size(kPhotoSize, kPhotoSize), contact);
     expected_contacts.push_back(contact);
   }
   EXPECT_EQ(contacts::test::ContactsToString(expected_contacts),
             contacts::test::ContactsToString(*contacts));
 }
 
+IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, UnicodeStrings) {
+  scoped_ptr<ScopedVector<contacts::Contact> > contacts;
+  EXPECT_TRUE(Download("feed_unicode.json", base::Time(), &contacts));
+
+  // All of these expected values are hardcoded in the feed.
+  scoped_ptr<contacts::Contact> contact1(new contacts::Contact);
+  InitContact("http://example.com/1", "2012-06-04T15:53:36.023Z",
+              false, "安藤 忠雄", "忠雄", "", "安藤", "", "",

[satorux1, 2012/08/20 18:37:58]

I think it's safer to escape them. multi-byte characters in source code is
worrisome.

1) not everyone is using UTF-8 capable editors
2) some editors may interpret this based on the current locale, and cause
garbled text.
3) likewise, some compilers may interpret this based on the current locale, and
cause test failures.

Here's a useful too for you.

http://0xcc.net/jsescape/

安藤 忠雄 ->
\xEF\xBB\xBF\xE5\xAE\x89\xE8\x97\xA4\x20\xE5\xBF\xA0\xE9\x9B\x84

[Daniel Erat, 2012/08/20 19:09:43]

Sure, was wondering about this too.  Updated.
I think you have an unnecessary BOM character at the beginning of this. :-)

+              contact1.get());
+  scoped_ptr<contacts::Contact> contact2(new contacts::Contact);
+  InitContact("http://example.com/2", "2012-06-21T16:20:13.208Z",
+              false, "Bob Smith", "Bob", "", "Smith", "", "",
+              contact2.get());
+  EXPECT_EQ(contacts::test::VarContactsToString(
+                2, contact1.get(), contact2.get()),
+            contacts::test::ContactsToString(*contacts));
+}
+
 }  // namespace gdata