| Index: chrome/browser/chromeos/customization_document.h
|
| diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
|
| index ad1b1f6c617f22eadbf6f548aa874c090148b0b1..4322855ea0df753589e0ae5455b8f57d55a89baf 100644
|
| --- a/chrome/browser/chromeos/customization_document.h
|
| +++ b/chrome/browser/chromeos/customization_document.h
|
| @@ -37,14 +37,13 @@ namespace user_prefs {
|
| class PrefRegistrySyncable;
|
| }
|
|
|
| -// This test is in global namespace so it must be declared here.
|
| -void Test__InitStartupCustomizationDocument(const std::string& manifest);
|
| -
|
| namespace chromeos {
|
|
|
| class CustomizationWallpaperDownloader;
|
| class ServicesCustomizationExternalLoader;
|
|
|
| +void InitStartupCustomizationDocumentForTesting(const std::string& manifest);
|
| +
|
| namespace system {
|
| class StatisticsProvider;
|
| } // system
|
| @@ -107,7 +106,7 @@ class StartupCustomizationDocument : public CustomizationDocument {
|
| FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
|
| FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, MultiLanguage);
|
| friend class OobeLocalizationTest;
|
| - friend void ::Test__InitStartupCustomizationDocument(
|
| + friend void InitStartupCustomizationDocumentForTesting(
|
| const std::string& manifest);
|
| friend struct DefaultSingletonTraits<StartupCustomizationDocument>;
|
|
|
|
|