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 27 matching lines @@
   // Replace with a single page model, and ensure we go back to the first page.
   ReplaceTestModel(1);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
   EXPECT_EQ(0, [pager selectedSegment]);
   EXPECT_EQ(1, [pager segmentCount]);
   EXPECT_EQ(1.0, [apps_grid_controller_ visiblePortionOfPage:0]);
 }
 
 // Test the view when the user is already signed in.
 TEST_F(AppListViewControllerTest, SignedIn) {
+  scoped_ptr<AppListModel> model(new AppListModel);
+  model->SetSignedIn(true);

[tapted, 2013/08/16 05:09:14]

I think this needs to be the default. Otherwise, things like the
AppListViewControllerTest.PagerChangingPage test above will just be showing a
signin page during the test - I checked ;). The problem is that Cocoa is smart
enough to optimize out all the calls to draw parts of the UI that are covered up
by opaque views. So, even though the unit test still passes, its coverage has
been reduced.

I think all you need is

AppListTestModel::AppListTestModel() {
  SetSignedIn(true);
}

in app_list_test_model.cc

[calamity, 2013/08/16 07:24:05]

Done.

+  ResetModel(model.Pass());
   // 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) {
   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;
+  model()->SetSignedIn(true);
   NotifySigninSuccess();

[tapted, 2013/08/16 05:09:14]

Thanks to your refactoring, I think this line is now unnecessary :)

[calamity, 2013/08/16 07:24:05]

Done.

   EXPECT_EQ(1u, [[[app_list_view_controller_ view] subviews] count]);
   EXPECT_FALSE([[app_list_view_controller_ backgroundView] isHidden]);
 }
 
 }  // namespace test
 }  // namespace app_list