Implemented the rest of loading/parsing logic for extension i18n:...

chrome/browser/extensions/extension_file_util_unittest.cc

 // Copyright (c) 2009 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/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 99 matching lines @@
             extension_file_util::CompareToInstalledVersion(
                 temp.path(), kBadId, kMissingVersion, "1.0.0", &version_dir));
 }
 
 // Creates minimal manifest, with or without default_locale section.
 bool CreateMinimalManifest(const std::string& locale,
                            const FilePath& manifest_path) {
   DictionaryValue manifest;
 
   manifest.SetString(keys::kVersion, "1.0.0.0");
-  manifest.SetString(keys::kName, "my extension");
+  manifest.SetString(keys::kName, "__MSG_name__");
+  manifest.SetString(keys::kDescription, "__MSG_description__");
   if (!locale.empty()) {
     manifest.SetString(keys::kDefaultLocale, locale);
   }
 
   JSONFileValueSerializer serializer(manifest_path);
   return serializer.Serialize(manifest);
 }
 
 TEST(ExtensionFileUtil, LoadExtensionWithValidLocales) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
   ASSERT_TRUE(CreateMinimalManifest(
       "en_US", temp.path().AppendASCII(Extension::kManifestFilename)));
 
   FilePath src_path = temp.path().AppendASCII(Extension::kLocaleFolder);
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   FilePath locale_1 = src_path.AppendASCII("sr");
   ASSERT_TRUE(file_util::CreateDirectory(locale_1));
 
-  std::string data = "foobar";
+  std::string data = "{ \"name\": { \"message\": \"foobar\" },"
+                     "\"description\": { \"message\": \"nice going\" } }";
   ASSERT_TRUE(
       file_util::WriteFile(locale_1.AppendASCII(Extension::kMessagesFilename),
                            data.c_str(), data.length()));
 
   FilePath locale_2 = src_path.AppendASCII("en_US");
   ASSERT_TRUE(file_util::CreateDirectory(locale_2));
 
   ASSERT_TRUE(
       file_util::WriteFile(locale_2.AppendASCII(Extension::kMessagesFilename),
                            data.c_str(), data.length()));
 
   std::string error;
   scoped_ptr<Extension> extension(
       extension_file_util::LoadExtension(temp.path(), false, &error));
   ASSERT_FALSE(extension == NULL);
-  EXPECT_EQ(static_cast<unsigned int>(2),
-            extension->supported_locales().size());
+  EXPECT_EQ(2U, extension->supported_locales().size());
   EXPECT_EQ("en-US", extension->default_locale());
+  EXPECT_EQ("foobar", extension->name());
+  EXPECT_EQ("nice going", extension->description());
 }
 
 TEST(ExtensionFileUtil, LoadExtensionWithoutLocalesFolder) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
   ASSERT_TRUE(CreateMinimalManifest(
       "", temp.path().AppendASCII(Extension::kManifestFilename)));
 
   std::string error;
   scoped_ptr<Extension> extension(
       extension_file_util::LoadExtension(temp.path(), false, &error));
   ASSERT_FALSE(extension == NULL);
   EXPECT_TRUE(extension->supported_locales().empty());
   EXPECT_TRUE(extension->default_locale().empty());
 }
 
 TEST(ExtensionFileUtil, CheckIllegalFilenamesNoUnderscores) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().AppendASCII("some_dir");
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
-  std::string data = "foobar";
+  std::string data = "{ \"name\": { \"message\": \"foobar\" } }";
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("some_file.txt"),
                                    data.c_str(), data.length()));
   std::string error;
   EXPECT_TRUE(extension_file_util::CheckForIllegalFilenames(temp.path(),
                                                             &error));
 }
 
 TEST(ExtensionFileUtil, CheckIllegalFilenamesOnlyReserved) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
@@ skipping 17 matching lines @@
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
   std::string error;
   EXPECT_FALSE(extension_file_util::CheckForIllegalFilenames(temp.path(),
                                                              &error));
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionsService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.