Add gaia_id to ProfileInfoCache.

chrome/browser/ui/webui/signin/inline_login_ui_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.
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 235 matching lines @@
   ASSERT_EQ(info1.pid, info2.pid);
   ASSERT_NE(info1.pid, info3.pid);
 }
 
 #if !defined(OS_CHROMEOS)
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferNoProfile) {
   std::string error_message;
   EXPECT_FALSE(InlineLoginHandlerImpl::CanOffer(
       NULL, InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", &error_message));
+      "12345", "user@gmail.com", &error_message));
   EXPECT_EQ("", error_message);
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOffer) {
   EnableOneClick(true);
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", NULL));
+      "12345", "user@gmail.com", NULL));
 
   EnableOneClick(false);
 
   std::string error_message;
 
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", &error_message));
+      "12345", "user@gmail.com", &error_message));
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferProfileConnected) {
   SetUpSigninManager("foo@gmail.com");
   EnableSigninAllowed(true);
 
   std::string error_message;
 
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "foo@gmail.com", &error_message));
+      "12345", "foo@gmail.com", &error_message));
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "foo", &error_message));
+      "12345", "foo", &error_message));
   EXPECT_FALSE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", &error_message));
+      "12345", "user@gmail.com", &error_message));
   EXPECT_EQ(l10n_util::GetStringFUTF8(IDS_SYNC_WRONG_EMAIL,
                                       base::UTF8ToUTF16("foo@gmail.com")),
             error_message);
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferUsernameNotAllowed) {
   SetAllowedUsernamePattern("*.google.com");
 
   std::string error_message;
   EXPECT_FALSE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "foo@gmail.com", &error_message));
+      "12345", "foo@gmail.com", &error_message));
   EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SYNC_LOGIN_NAME_PROHIBITED),
             error_message);
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferWithRejectedEmail) {
   EnableSigninAllowed(true);
 
   AddEmailToOneClickRejectedList("foo@gmail.com");
   AddEmailToOneClickRejectedList("user@gmail.com");
 
   std::string error_message;
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "foo@gmail.com", &error_message));
+      "12345", "foo@gmail.com", &error_message));
   EXPECT_TRUE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", &error_message));
+      "12345", "user@gmail.com", &error_message));
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferNoSigninCookies) {
   AllowSigninCookies(false);
   EnableSigninAllowed(true);
 
   std::string error_message;
   EXPECT_FALSE(InlineLoginHandlerImpl::CanOffer(
       browser()->profile(), InlineLoginHandlerImpl::CAN_OFFER_FOR_ALL,
-      "user@gmail.com", &error_message));
+      "12345", "user@gmail.com", &error_message));
   EXPECT_EQ("", error_message);
 }
 
 #endif  // OS_CHROMEOS
 
 class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest {
  public:
   FooWebUIProvider& foo_provider() { return foo_provider_; }
 
  private:
@@ skipping 127 matching lines @@
       ->AddObserver(&observer);
   base::RunLoop run_loop;
   EXPECT_CALL(observer, OnUntrustedLoginUIShown())
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
   ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
   run_loop.Run();
   base::MessageLoop::current()->RunUntilIdle();
 }
 #endif // OS_CHROMEOS