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

Unified Diff: chrome/browser/ui/app_list/apps_model_builder_unittest.cc

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove binary changes Created 7 years, 3 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/ui/app_list/apps_model_builder_unittest.cc
diff --git a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
index c1554e55e3d068b8a01cd93cabeab703bd56832a..a19062e1b8d1de5e45cc5e12bce9625bab4ad507 100644
--- a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
@@ -91,7 +91,6 @@ TEST_F(AppsModelBuilderTest, Build) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
// The apps list would have 3 extension apps in the profile.
EXPECT_EQ(std::string("Packaged App 1,Packaged App 2,Hosted App"),
@@ -118,7 +117,6 @@ TEST_F(AppsModelBuilderTest, HideWebStore) {
// Web stores should be present in the AppListModel.
app_list::AppListModel::Apps model1;
AppsModelBuilder builder1(profile_.get(), &model1, NULL);
- builder1.Build();
std::string content = GetModelContent(&model1);
EXPECT_NE(std::string::npos, content.find("webstore"));
EXPECT_NE(std::string::npos, content.find("enterprise_webstore"));
@@ -129,7 +127,6 @@ TEST_F(AppsModelBuilderTest, HideWebStore) {
// Web stores should NOT be in the AppListModel.
app_list::AppListModel::Apps model2;
AppsModelBuilder builder2(profile_.get(), &model2, NULL);
- builder2.Build();
content = GetModelContent(&model2);
EXPECT_EQ(std::string::npos, content.find("webstore"));
EXPECT_EQ(std::string::npos, content.find("enterprise_webstore"));
@@ -139,7 +136,6 @@ TEST_F(AppsModelBuilderTest, DisableAndEnable) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
service_->DisableExtension(kHostedAppId,
extensions::Extension::DISABLE_NONE);
@@ -155,7 +151,6 @@ TEST_F(AppsModelBuilderTest, Uninstall) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
service_->UninstallExtension(kPackagedApp2Id, false, NULL);
EXPECT_EQ(std::string("Packaged App 1,Hosted App"),
@@ -168,7 +163,6 @@ TEST_F(AppsModelBuilderTest, UninstallTerminatedApp) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
const extensions::Extension* app =
service_->GetInstalledExtension(kPackagedApp2Id);
@@ -188,7 +182,6 @@ TEST_F(AppsModelBuilderTest, OrdinalPrefsChange) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
@@ -213,7 +206,6 @@ TEST_F(AppsModelBuilderTest, OnExtensionMoved) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
sorting->SetPageOrdinal(kHostedAppId,
@@ -246,10 +238,9 @@ TEST_F(AppsModelBuilderTest, InvalidOrdinal) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
- AppsModelBuilder builder(profile_.get(), model.get(), NULL);
// This should not assert or crash.
- builder.Build();
+ AppsModelBuilder builder(profile_.get(), model.get(), NULL);
}
TEST_F(AppsModelBuilderTest, OrdinalConfilicts) {
@@ -270,7 +261,6 @@ TEST_F(AppsModelBuilderTest, OrdinalConfilicts) {
scoped_ptr<app_list::AppListModel::Apps> model(
new app_list::AppListModel::Apps);
AppsModelBuilder builder(profile_.get(), model.get(), NULL);
- builder.Build();
// By default, conflicted items are sorted by their app ids.
EXPECT_EQ(std::string("Hosted App,Packaged App 1,Packaged App 2"),
« no previous file with comments | « chrome/browser/ui/app_list/apps_model_builder.cc ('k') | chrome/browser/ui/app_list/chrome_signin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698