Fix unwanted sign in to Chrome when the user signs in to another service.

chrome/browser/signin/signin_browsertest.cc

 // 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 
 #include "base/command_line.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 189 matching lines @@
   SigninManager* signin = SigninManagerFactory::GetForProfile(
       browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
   ui_test_utils::NavigateToURL(browser(), start_url);
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  // Simulate clicking on the Skip for now link by navigating to the URL.
-  ui_test_utils::NavigateToURL(browser(), skip_url);
+  // Simulate clicking on the Skip for now link. It's important to have a
+  // link transition so that OneClickSigninHelper removes the blank page
+  // from the history.
+  chrome::NavigateParams navigate_params(browser(),
+                                         skip_url,
+                                         content::PAGE_TRANSITION_LINK);
+  ui_test_utils::NavigateToURL(&navigate_params);
 
   // Register an observer that will navigate back immediately on the commit of
   // the NTP. This will allow us to hit the race condition of navigating back
   // before the DidStopLoading message of NTP gets delivered. This must be
   // created after the navigation to the skip_url has finished loading,
   // otherwise this observer will navigate back, before the history cleaner
   // has had a chance to remove the navigation entry.
   BackOnNTPCommitObserver commit_observer(web_contents);
 
   // Since the navigation to the blank URL is monitored for, the
   // OneClickSigninHelper initiates immediately a navigation to the NTP.
   // Thus, we expect the visible URL to be the NTP.
   EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL());
   EXPECT_EQ(ntp_url, web_contents->GetVisibleURL());
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   observer.Wait();
   EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
 }
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_