A trivial fix for localizing 'Bookmark bar' (folder name) in exported 'bookma...

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

 // Copyright (c) 2006-2008 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
@@ skipping 42 matching lines @@
     EXPECT_TRUE(path_count < 3 || entry.path[3] == f3);
   }
 
   std::wstring path_;
 };
 
 // Tests bookmark_html_writer by populating a BookmarkModel, writing it out by
 // way of bookmark_html_writer, then using the importer to read it back in.
 TEST_F(BookmarkHTMLWriterTest, Test) {
   // Populate the BookmarkModel. This creates the following bookmark structure:
-  // Bookmark Bar
+  // Bookmarks bar
   //   F1
   //     url1
   //     F2
   //       url2
   //   url3
   // Other
   //   url1
   //   url2
   //   F3
   //     F4
@@ skipping 29 matching lines @@
   bookmark_html_writer::WriteBookmarks(NULL, &model, path_);
 
   // Read the bookmarks back in.
   std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks;
   Firefox2Importer::ImportBookmarksFile(path_, std::set<GURL>(), false,
                                         L"x", NULL, &parsed_bookmarks, NULL,
                                         NULL);
 
   // Verify we got back what we wrote.
   ASSERT_EQ(6U, parsed_bookmarks.size());
+  // TODO(jungshik): This test will fail if run in a non-en-US locale.
+  // Hardcode the value of IDS_BOOKMARK_BAR_FOLDER_NAME in en-US locale.
+  const wchar_t* kBookmarkBarFolderName = L"Bookmarks bar"; 

[sky, 2009/03/24 20:11:11]

All unit tests are run in en-US (see chrome_test_suite.h).

   AssertBookmarkEntryEquals(parsed_bookmarks[0], false, url1, url1_title, t1,
-                            L"Bookmark Bar", f1_title, std::wstring());
+                            kBookmarkBarFolderName, f1_title, std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[1], false, url2, url2_title, t2,
-                            L"Bookmark Bar", f1_title, f2_title);
+                            kBookmarkBarFolderName, f1_title, f2_title);
   AssertBookmarkEntryEquals(parsed_bookmarks[2], false, url3, url3_title, t3,
-                            L"Bookmark Bar", std::wstring(), std::wstring());
+                            kBookmarkBarFolderName, std::wstring(),
+                            std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url1, url1_title, t1,
                             std::wstring(), std::wstring(), std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url2, url2_title, t2,
                             std::wstring(), std::wstring(), std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url1, url1_title, t1,
                             f3_title, f4_title, std::wstring());
 }