| Index: chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc
|
| index 7bcb88de553969f37e49819c51f6f1aaf7ab75b9..d7421aa93dc536ad58bf692cbff65b59b92f1b36 100644
|
| --- a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc
|
| +++ b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/chromeos/login/wallpaper_manager.h"
|
| #include "chrome/browser/chromeos/login/wallpaper_manager_test_utils.h"
|
| #include "chrome/browser/google/google_url_tracker.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chromeos/chromeos_switches.h"
|
| @@ -217,7 +218,8 @@ class WallpaperImageFetcherFactory {
|
| };
|
|
|
| class CustomizationWallpaperDownloaderBrowserTest
|
| - : public InProcessBrowserTest {
|
| + : public InProcessBrowserTest,
|
| + public testing::WithParamInterface<bool> {
|
| public:
|
| CustomizationWallpaperDownloaderBrowserTest()
|
| : controller_(NULL),
|
| @@ -234,6 +236,8 @@ class CustomizationWallpaperDownloaderBrowserTest
|
| virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
| command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
|
| + if (GetParam())
|
| + command_line->AppendSwitch(::switches::kMultiProfiles);
|
| }
|
|
|
| virtual void CleanUpOnMainThread() OVERRIDE { controller_ = NULL; }
|
| @@ -258,7 +262,12 @@ class CustomizationWallpaperDownloaderBrowserTest
|
| DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloaderBrowserTest);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
|
| +INSTANTIATE_TEST_CASE_P(
|
| + CustomizationWallpaperDownloaderBrowserTestInstantiation,
|
| + CustomizationWallpaperDownloaderBrowserTest,
|
| + testing::Bool());
|
| +
|
| +IN_PROC_BROWSER_TEST_P(CustomizationWallpaperDownloaderBrowserTest,
|
| OEMWallpaperIsPresent) {
|
| CreateCmdlineWallpapers();
|
| WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
|
| @@ -287,7 +296,7 @@ IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
|
| EXPECT_EQ(1U, url_factory.num_attempts());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(CustomizationWallpaperDownloaderBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(CustomizationWallpaperDownloaderBrowserTest,
|
| OEMWallpaperRetryFetch) {
|
| CreateCmdlineWallpapers();
|
| WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
|
|
|