Apply VPD customization even if startup customization manifest is missing.

chrome/browser/chromeos/customization_document.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 46 matching lines @@
 };
 
 // OEM startup customization document class.
 // Now StartupCustomizationDocument is loaded in c-tor so just after create it
 // may be ready or not (if manifest is missing or corrupted) and this state
 // won't be changed later (i.e. IsReady() always return the same value).
 class StartupCustomizationDocument : public CustomizationDocument {
  public:
   static StartupCustomizationDocument* GetInstance();
 
-  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;
 
+  const std::string& registration_url() const { return registration_url_; }
+
+  // These methods can be called even if !IsReady(), in this case VPD values
+  // 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_; }
+
  private:
-  FRIEND_TEST(StartupCustomizationDocumentTest, Basic);
-  FRIEND_TEST(StartupCustomizationDocumentTest, VPD);
-  FRIEND_TEST(StartupCustomizationDocumentTest, BadManifest);
+  FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, Basic);
+  FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, VPD);
+  FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
   friend struct DefaultSingletonTraits<StartupCustomizationDocument>;
 
   // C-tor for singleton construction.
   StartupCustomizationDocument();
 
   // C-tor for test construction.
   StartupCustomizationDocument(system::StatisticsProvider* provider,
                                const std::string& manifest);
 
   virtual ~StartupCustomizationDocument();
@@ skipping 130 matching lines @@
 
   // Initial locale value.
   std::string initial_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_