Make customization documents singletons.

chrome/browser/chromeos/customization_document_unittest.cc

Index: chrome/browser/chromeos/customization_document_unittest.cc
diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc
index 83ad1041de82f62d5091b83963295671474a756d..370f99c10f605e42f84e3b3513ee30b02b5ed524 100644
--- a/chrome/browser/chromeos/customization_document_unittest.cc
+++ b/chrome/browser/chromeos/customization_document_unittest.cc
@@ -85,8 +85,8 @@ TEST(StartupCustomizationDocumentTest, Basic) {
       GetMachineStatistic(std::string("hwid"), NotNull()))
           .WillOnce(DoAll(SetArgumentPointee<1>(std::string("Mario 12345")),
                           Return(true)));
-  StartupCustomizationDocument customization(&mock_system_access);
-  EXPECT_TRUE(customization.LoadManifestFromString(kGoodStartupManifest));
+  StartupCustomizationDocument customization(&mock_system_access,
+                                             kGoodStartupManifest);
   EXPECT_EQ(customization.initial_locale(), "ru-RU");
   EXPECT_EQ(customization.initial_timezone(), "Europe/Moscow");
   EXPECT_EQ(customization.keyboard_layout(), "xkb:ru::rus");
@@ -125,8 +125,9 @@ TEST(StartupCustomizationDocumentTest, VPD) {
       GetMachineStatistic(std::string("keyboard_layout"), NotNull()))
           .WillOnce(DoAll(SetArgumentPointee<1>(std::string("mozc-jp")),
                           Return(true)));
-  StartupCustomizationDocument customization(&mock_system_access);
-  EXPECT_TRUE(customization.LoadManifestFromString(kGoodStartupManifest));
+  StartupCustomizationDocument customization(&mock_system_access,
+                                             kGoodStartupManifest);
+  EXPECT_TRUE(customization.IsReady());
   EXPECT_EQ(customization.initial_locale(), "ja");
   EXPECT_EQ(customization.initial_timezone(), "Asia/Tokyo");
   EXPECT_EQ(customization.keyboard_layout(), "mozc-jp");
@@ -134,13 +135,13 @@ TEST(StartupCustomizationDocumentTest, VPD) {
 
 TEST(StartupCustomizationDocumentTest, BadManifest) {
   MockSystemAccess mock_system_access;
-  StartupCustomizationDocument customization(&mock_system_access);
-  EXPECT_FALSE(customization.LoadManifestFromString(kBadManifest));
+  StartupCustomizationDocument customization(&mock_system_access, kBadManifest);
+  EXPECT_FALSE(customization.IsReady());
 }
 
 TEST(ServicesCustomizationDocumentTest, Basic) {
-  chromeos::ServicesCustomizationDocument customization;
-  EXPECT_TRUE(customization.LoadManifestFromString(kGoodServicesManifest));
+  ServicesCustomizationDocument customization(kGoodServicesManifest);
+  EXPECT_TRUE(customization.IsReady());
 
   EXPECT_EQ(customization.GetInitialStartPage("en-US"),
             "http://mario/promo");
@@ -149,7 +150,6 @@ TEST(ServicesCustomizationDocumentTest, Basic) {
   EXPECT_EQ(customization.GetInitialStartPage("ja"),
             "http://mario/global/promo");
 
-
   EXPECT_EQ(customization.GetSupportPage("en-US"),
             "http://mario/us");
   EXPECT_EQ(customization.GetSupportPage("ru-RU"),
@@ -159,8 +159,8 @@ TEST(ServicesCustomizationDocumentTest, Basic) {
 }
 
 TEST(ServicesCustomizationDocumentTest, BadManifest) {
-  chromeos::ServicesCustomizationDocument customization;
-  EXPECT_FALSE(customization.LoadManifestFromString(kBadManifest));
+  ServicesCustomizationDocument customization(kBadManifest);
+  EXPECT_FALSE(customization.IsReady());
 }
 
 }  // namespace chromeos