Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Unified Diff: chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc

Issue 283183002: CustomizationWallpaperDownloaderBrowserTest should also test multi-profile mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698