Reland r242290, r241609, r242134.

chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

 // Copyright (c) 2012 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/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ skipping 33 matching lines @@
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Return;
 
 namespace {
 
-// Explicit URLs are sign in URLs created by chrome for specific sign in access
-// points.  Implicit URLs are those to sign for some Google service, like gmail
-// or drive.  In former case, with a valid URL, we don't want to offer the
-// interstitial.  In all other cases we do.
-
-const char kImplicitURLString[] =
-    "https://accounts.google.com/ServiceLogin"
-    "?service=foo&continue=http://foo.google.com";
-
 class SigninManagerMock : public FakeSigninManager {
  public:
   explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {
     Initialize(profile, NULL);
   }
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
 static BrowserContextKeyedService* BuildSigninManagerMock(
     content::BrowserContext* profile) {
@@ skipping 668 matching lines @@
   EXPECT_CALL(*sync_service, RemoveObserver(helper));
   SetContents(NULL);
 }
 
 // I/O thread tests
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThread) {
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadIncognito) {
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(true));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoIOData) {
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, NULL));
+                valid_gaia_url_, &request_, NULL));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadBadURL) {
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(
       OneClickSigninHelper::IGNORE_REQUEST,
       OneClickSigninHelper::CanOfferOnIOThreadImpl(
-          GURL("https://foo.com/"), std::string(), &request_, io_data.get()));
+          GURL("https://foo.com/"), &request_, io_data.get()));
   EXPECT_EQ(OneClickSigninHelper::IGNORE_REQUEST,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 GURL("http://accounts.google.com/"),
-                std::string(),
                 &request_,
                 io_data.get()));
 }
 
-TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadReferrer) {
-  scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
-  std::string continue_url(signin::GetPromoURL(
-      signin::SOURCE_START_PAGE, false).spec());
-
-  EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
-            OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, continue_url, &request_, io_data.get()));
-
-  EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
-            OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, kImplicitURLString, &request_, io_data.get()));
-
-  std::string bad_url_1 = continue_url;
-  const std::string service_name = "chromiumsync";
-  bad_url_1.replace(bad_url_1.find(service_name), service_name.length(),
-                    "foo");
-
-  EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
-            OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, bad_url_1, &request_, io_data.get()));
-
-  std::string bad_url_2 = continue_url;
-  const std::string source_num = "%3D0";
-  bad_url_2.replace(bad_url_1.find(source_num), source_num.length(), "%3D10");
-
-  EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
-            OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, bad_url_2, &request_, io_data.get()));
-
-  std::string bad_url_3 = continue_url;
-  const std::string source = "source%3D0";
-  bad_url_3.erase(bad_url_1.find(source), source.length());
-
-  EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
-            OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, bad_url_3, &request_, io_data.get()));
-}
-
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabled) {
   EnableOneClick(false);
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadSignedIn) {
   PrefService* pref_service = profile()->GetPrefs();
   pref_service->SetString(prefs::kGoogleServicesUsername, "user@gmail.com");
 
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailNotAllowed) {
   SetAllowedUsernamePattern("*@example.com");
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_,  &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadEmailAlreadyUsed) {
   ProfileInfoCache* cache = testing_profile_manager_.profile_info_cache();
   const base::FilePath& user_data_dir = cache->GetUserDataDir();
   cache->AddProfileToCache(user_data_dir.Append(FILE_PATH_LITERAL("user")),
                            UTF8ToUTF16("user"),
                            UTF8ToUTF16("user@gmail.com"), 0, std::string());
 
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadWithRejectedEmail) {
   AddEmailToOneClickRejectedList("user@gmail.com");
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
   AllowSigninCookies(false);
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 
   // Simulate a policy disabling signin by writing kSigninAllowed directly.
   // We should not offer to sign in the browser.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSigninAllowed, base::Value::CreateBooleanValue(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 
   // Reset the preference.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSigninAllowed, base::Value::CreateBooleanValue(true));
 
   // Simulate a policy disabling sync by writing kSyncManaged directly.
   // We should still offer to sign in the browser.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
-                valid_gaia_url_, std::string(), &request_, io_data.get()));
+                valid_gaia_url_, &request_, io_data.get()));
 }