Delay loading the NTP after sign in until MergeSession has been performed in

chrome/browser/signin/signin_tracker_unittest.cc

Index: chrome/browser/signin/signin_tracker_unittest.cc
diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc
index 11bef684736cc343a93b98118a2e130c9e1092da..e0b1cc7346bc50da82f4b3cd534f81d59767e1d9 100644
--- a/chrome/browser/signin/signin_tracker_unittest.cc
+++ b/chrome/browser/signin/signin_tracker_unittest.cc
@@ -42,12 +42,19 @@ class MockObserver : public SigninTracker::Observer {
 
   MOCK_METHOD1(SigninFailed, void(const GoogleServiceAuthError&));
   MOCK_METHOD0(SigninSuccess, void(void));
+  MOCK_METHOD1(MergeSessionComplete, void(const GoogleServiceAuthError&));
 };
 
 }  // namespace
 
 class SigninTrackerTest : public testing::Test {
  public:
+#if defined(OS_CHROMEOS)
+   typedef FakeSigninManagerBase FakeSigninManagerForTesting;
+#else
+   typedef FakeSigninManager FakeSigninManagerForTesting;
+#endif
+
   SigninTrackerTest() {}
   virtual void SetUp() OVERRIDE {
     TestingProfile::Builder builder;
@@ -60,9 +67,9 @@ class SigninTrackerTest : public testing::Test {
         static_cast<FakeProfileOAuth2TokenService*>(
             ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()));
 
-    mock_signin_manager_ = static_cast<FakeSigninManagerBase*>(
+    mock_signin_manager_ = static_cast<FakeSigninManagerForTesting*>(
         SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
-            profile_.get(), FakeSigninManagerBase::Build));
+            profile_.get(), FakeSigninManagerForTesting::Build));
     mock_signin_manager_->Initialize(profile_.get(), NULL);
 
     tracker_.reset(new SigninTracker(profile_.get(), &observer_));
@@ -75,7 +82,7 @@ class SigninTrackerTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<SigninTracker> tracker_;
   scoped_ptr<TestingProfile> profile_;
-  FakeSigninManagerBase* mock_signin_manager_;
+  FakeSigninManagerForTesting* mock_signin_manager_;
   FakeProfileOAuth2TokenService* fake_oauth2_token_service_;
   MockObserver observer_;
 };