Apply VPD customization even if startup customization manifest is missing.

chrome/browser/chromeos/customization_document.h

Index: chrome/browser/chromeos/customization_document.h
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 47ab6c94ae32e19197cc8ef97a1a65d083f23953..b75633c9032c16535ceff18f76187490bc3a436a 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -64,13 +64,16 @@ class StartupCustomizationDocument : public CustomizationDocument {
  public:
   static StartupCustomizationDocument* GetInstance();
 
+  std::string GetHelpPage(const std::string& locale) const;
+  std::string GetEULAPage(const std::string& locale) const;
+
+  const std::string& registration_url() const { return registration_url_; }
+
+  // These methods can be called even if !IsReady() in this case VPD values

[whywhat, 2011/08/16 08:01:24]

nit: comma or period after IsReady()

[Dmitry Polukhin, 2011/08/16 08:29:51]

Done.

+  // will be returned.
   const std::string& initial_locale() const { return initial_locale_; }
   const std::string& initial_timezone() const { return initial_timezone_; }
   const std::string& keyboard_layout() const { return keyboard_layout_; }
-  const std::string& registration_url() const { return registration_url_; }
-
-  std::string GetHelpPage(const std::string& locale) const;
-  std::string GetEULAPage(const std::string& locale) const;
 
  private:
   FRIEND_TEST(StartupCustomizationDocumentTest, Basic);

[whywhat, 2011/08/16 08:01:24]

Could you replace with FRIEND_TEST_ALL_PREFIXES?

[Dmitry Polukhin, 2011/08/16 08:29:51]

Done.