Move signin status and current user information into AppListModel.

ui/app_list/cocoa/app_list_view_controller_unittest.mm

 // Copyright 2013 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 "base/mac/scoped_nsobject.h"
 #import "testing/gtest_mac.h"
 #import "ui/app_list/cocoa/app_list_view_controller.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 #import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
 #include "ui/app_list/signin_delegate.h"
@@ skipping 49 matching lines @@
     return base::string16();
   }
 
  protected:
   base::scoped_nsobject<AppListViewController> app_list_view_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListViewControllerTest);
 };
 
-// Helper class allowing NeedSignin() to return true during SetUp(), to test an
-// initial state where signin is required, and the regular view starts hidden.
-class AppListViewControllerSigninTest : public AppListViewControllerTest {
- public:
-  AppListViewControllerSigninTest() : needs_signin_(true) {}
-
-  // SigninDelegate override:
-  virtual bool NeedSignin() OVERRIDE { return needs_signin_; }
-
- protected:
-  bool needs_signin_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AppListViewControllerSigninTest);
-};
-
 TEST_VIEW(AppListViewControllerTest, [app_list_view_controller_ view]);
 
 // Test that adding and removing pages updates the pager.
 TEST_F(AppListViewControllerTest, PagerSegmentCounts) {
   NSSegmentedControl* pager = [app_list_view_controller_ pagerControl];
   EXPECT_EQ(1, [pager segmentCount]);
 
   ReplaceTestModel(kItemsPerPage * 2);
   EXPECT_EQ(2, [pager segmentCount]);
   model()->PopulateApps(1);
@@ skipping 33 matching lines @@
 }
 
 // Test the view when the user is already signed in.
 TEST_F(AppListViewControllerTest, SignedIn) {
   // There should be just 1, visible subview when signed in.
   EXPECT_EQ(1u, [[[app_list_view_controller_ view] subviews] count]);
   EXPECT_FALSE([[app_list_view_controller_ backgroundView] isHidden]);
 }
 
 // Test the view when signin is required.
-TEST_F(AppListViewControllerSigninTest, NeedsSignin) {
+TEST_F(AppListViewControllerTest, NeedsSignin) {
+  // Begin the test with a signed out app list.
+  scoped_ptr<AppListModel> new_model(new AppListModel);
+  new_model->SetSignedIn(false);
+  ResetModel(new_model.Pass());
   EXPECT_EQ(2u, [[[app_list_view_controller_ view] subviews] count]);
   EXPECT_TRUE([[app_list_view_controller_ backgroundView] isHidden]);
 
   // Simulate signing in, should enter the SignedIn state.
-  needs_signin_ = false;
-  NotifySigninSuccess();
+  model()->SetSignedIn(true);
   EXPECT_EQ(1u, [[[app_list_view_controller_ view] subviews] count]);
   EXPECT_FALSE([[app_list_view_controller_ backgroundView] isHidden]);
 }
 
 }  // namespace test
 }  // namespace app_list