Add profile selector menu to app list.

chrome/browser/ui/app_list/apps_model_builder_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/apps_model_builder.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 73 matching lines @@
     // There should be 4 extensions in the test profile.
     const ExtensionSet* extensions = service_->extensions();
     ASSERT_EQ(static_cast<size_t>(4),  extensions->size());
   }
 };
 
 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"),
             GetModelContent(model.get()));
 }
 
 TEST_F(AppsModelBuilderTest, HideWebStore) {
   // Install a "web store" app.
   scoped_refptr<extensions::Extension> store =
       MakeApp("webstore",
               "0.0",
               "http://google.com",
               std::string(extension_misc::kWebStoreAppId));
   service_->AddExtension(store.get());
 
   // Install an "enterprise web store" app.
   scoped_refptr<extensions::Extension> enterprise_store =
       MakeApp("enterprise_webstore",
               "0.0",
               "http://google.com",
               std::string(extension_misc::kEnterpriseWebStoreAppId));
   service_->AddExtension(enterprise_store.get());
 
   // 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"));
 
   // Activate the HideWebStoreIcon policy.
   profile_->GetPrefs()->SetBoolean(prefs::kHideWebStoreIcon, true);
 
   // 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"));
 }
 
 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);
   EXPECT_EQ(std::string("Packaged App 1,Packaged App 2,Hosted App"),
             GetModelContent(model.get()));
 
   service_->EnableExtension(kHostedAppId);
   EXPECT_EQ(std::string("Packaged App 1,Packaged App 2,Hosted App"),
             GetModelContent(model.get()));
 }
 
 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"),
             GetModelContent(model.get()));
 
   base::RunLoop().RunUntilIdle();
 }
 
 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);
   ASSERT_TRUE(app != NULL);
 
   // Simulate an app termination.
   service_->TrackTerminatedExtensionForTest(app);
 
   service_->UninstallExtension(kPackagedApp2Id, false, NULL);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App"),
             GetModelContent(model.get()));
 
   base::RunLoop().RunUntilIdle();
 }
 
 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();
 
   syncer::StringOrdinal package_app_page =
       sorting->GetPageOrdinal(kPackagedApp1Id);
   sorting->SetPageOrdinal(kHostedAppId, package_app_page.CreateBefore());
   EXPECT_EQ(std::string("Hosted App,Packaged App 1,Packaged App 2"),
             GetModelContent(model.get()));
 
   syncer::StringOrdinal app1_ordinal =
       sorting->GetAppLaunchOrdinal(kPackagedApp1Id);
   syncer::StringOrdinal app2_ordinal =
       sorting->GetAppLaunchOrdinal(kPackagedApp2Id);
   sorting->SetPageOrdinal(kHostedAppId, package_app_page);
   sorting->SetAppLaunchOrdinal(kHostedAppId,
                                app1_ordinal.CreateBetween(app2_ordinal));
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 }
 
 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,
                           sorting->GetPageOrdinal(kPackagedApp1Id));
 
   service_->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 
   service_->OnExtensionMoved(kHostedAppId, kPackagedApp2Id, std::string());
@@ skipping 12 matching lines @@
 
   // Creates an corrupted ordinal case.
   ExtensionScopedPrefs* scoped_prefs = service_->extension_prefs();
   scoped_prefs->UpdateExtensionPref(
       kHostedAppId,
       "page_ordinal",
       base::Value::CreateStringValue("a corrupted ordinal"));
 
   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) {
   // Creates conflict ordinals for app1 and app2.
   syncer::StringOrdinal conflict_ordinal =
       syncer::StringOrdinal::CreateInitialOrdinal();
 
   ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
   sorting->SetPageOrdinal(kHostedAppId, conflict_ordinal);
   sorting->SetAppLaunchOrdinal(kHostedAppId, conflict_ordinal);
 
   sorting->SetPageOrdinal(kPackagedApp1Id, conflict_ordinal);
   sorting->SetAppLaunchOrdinal(kPackagedApp1Id, conflict_ordinal);
 
   sorting->SetPageOrdinal(kPackagedApp2Id, conflict_ordinal);
   sorting->SetAppLaunchOrdinal(kPackagedApp2Id, conflict_ordinal);
 
   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"),
             GetModelContent(model.get()));
 
   // Move hosted app between app1 and app2 and it should not crash.
   service_->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 }