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

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

Issue 236013002: Apply default wallpaper from customization manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove wallpaper URL from ServicesCustomizationDocumentTest. Created 6 years, 8 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
Index: chrome/browser/chromeos/customization_document_unittest.cc
diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc
index 4eae520b385cc0d6e07bb9946fbbe8b7a505beb0..cb91510e78f8ec00bdddbb70ee5929593351240c 100644
--- a/chrome/browser/chromeos/customization_document_unittest.cc
+++ b/chrome/browser/chromeos/customization_document_unittest.cc
@@ -76,7 +76,6 @@ const char kBadManifest[] = "{\"version\": \"1\"}";
const char kGoodServicesManifest[] =
"{"
" \"version\": \"1.0\","
- " \"default_wallpaper\": \"http://somedomain.com/image.png\",\n"
Dmitry Polukhin 2014/04/23 20:24:04 Why did you do this instead of adding test? Moreov
" \"default_apps\": [\n"
" \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n"
" \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"\n"
@@ -323,19 +322,20 @@ TEST_F(ServicesCustomizationDocumentTest, Basic) {
RunUntilIdle();
EXPECT_TRUE(doc->IsReady());
- EXPECT_EQ(doc->GetDefaultWallpaperUrl().spec(),
- "http://somedomain.com/image.png");
+ GURL wallpaper_url;
+ EXPECT_FALSE(doc->GetDefaultWallpaperUrl(&wallpaper_url));
+ EXPECT_EQ("", wallpaper_url.spec());
std::vector<std::string> default_apps;
EXPECT_TRUE(doc->GetDefaultApps(&default_apps));
ASSERT_EQ(default_apps.size(), 2u);
- EXPECT_EQ(default_apps[0], "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
- EXPECT_EQ(default_apps[1], "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
+ EXPECT_EQ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", default_apps[0]);
+ EXPECT_EQ("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", default_apps[1]);
- EXPECT_EQ(doc->GetOemAppsFolderName("en-US"), "EN-US OEM Name");
- EXPECT_EQ(doc->GetOemAppsFolderName("en"), "EN OEM Name");
- EXPECT_EQ(doc->GetOemAppsFolderName("ru"), "Default OEM Name");
+ EXPECT_EQ("EN-US OEM Name", doc->GetOemAppsFolderName("en-US"));
+ EXPECT_EQ("EN OEM Name", doc->GetOemAppsFolderName("en"));
+ EXPECT_EQ("Default OEM Name", doc->GetOemAppsFolderName("ru"));
}
TEST_F(ServicesCustomizationDocumentTest, NoCustomizationIdInVpd) {
@@ -427,7 +427,7 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {
app_list::AppListSyncableService* service =
app_list::AppListSyncableServiceFactory::GetForProfile(profile.get());
ASSERT_TRUE(service);
- EXPECT_EQ(service->GetOemFolderNameForTest(), "EN OEM Name");
+ EXPECT_EQ("EN OEM Name", service->GetOemFolderNameForTest());
}
TEST_F(ServicesCustomizationDocumentTest, CustomizationManifestNotFound) {
« no previous file with comments | « chrome/browser/chromeos/customization_document.cc ('k') | chrome/browser/chromeos/customization_wallpaper_downloader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698