| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 EXPECT_EQ(initial_profile_count + 1U, storage.GetNumberOfProfiles()); | 411 EXPECT_EQ(initial_profile_count + 1U, storage.GetNumberOfProfiles()); |
| 412 | 412 |
| 413 // The second should though. | 413 // The second should though. |
| 414 CloseBrowserSynchronously(browser_list->get(1)); | 414 CloseBrowserSynchronously(browser_list->get(1)); |
| 415 EXPECT_EQ(1U, browser_list->size()); | 415 EXPECT_EQ(1U, browser_list->size()); |
| 416 EXPECT_EQ(initial_profile_count, storage.GetNumberOfProfiles()); | 416 EXPECT_EQ(initial_profile_count, storage.GetNumberOfProfiles()); |
| 417 } | 417 } |
| 418 | 418 |
| 419 // The test makes sense on those platforms where the keychain exists. | 419 // The test makes sense on those platforms where the keychain exists. |
| 420 #if !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 420 #if !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 421 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DeletePasswords) { | 421 |
| 422 // Suddenly started failing on Linux, see http://crbug.com/660488. |
| 423 #if defined(OS_LINUX) |
| 424 #define MAYBE_DeletePasswords DISABLED_DeletePasswords |
| 425 #else |
| 426 #define MAYBE_DeletePasswords DeletePasswords |
| 427 #endif |
| 428 |
| 429 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_DeletePasswords) { |
| 422 Profile* profile = ProfileManager::GetActiveUserProfile(); | 430 Profile* profile = ProfileManager::GetActiveUserProfile(); |
| 423 ASSERT_TRUE(profile); | 431 ASSERT_TRUE(profile); |
| 424 | 432 |
| 425 autofill::PasswordForm form; | 433 autofill::PasswordForm form; |
| 426 form.scheme = autofill::PasswordForm::SCHEME_HTML; | 434 form.scheme = autofill::PasswordForm::SCHEME_HTML; |
| 427 form.origin = GURL("http://accounts.google.com/LoginAuth"); | 435 form.origin = GURL("http://accounts.google.com/LoginAuth"); |
| 428 form.signon_realm = "http://accounts.google.com/"; | 436 form.signon_realm = "http://accounts.google.com/"; |
| 429 form.username_value = base::ASCIIToUTF16("my_username"); | 437 form.username_value = base::ASCIIToUTF16("my_username"); |
| 430 form.password_value = base::ASCIIToUTF16("my_password"); | 438 form.password_value = base::ASCIIToUTF16("my_password"); |
| 431 form.preferred = true; | 439 form.preferred = true; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 | 500 |
| 493 EXPECT_FALSE(profile->HasOffTheRecordProfile()); | 501 EXPECT_FALSE(profile->HasOffTheRecordProfile()); |
| 494 EXPECT_FALSE(profile_manager->IsValidProfile(incognito_profile)); | 502 EXPECT_FALSE(profile_manager->IsValidProfile(incognito_profile)); |
| 495 EXPECT_EQ(initial_profile_count, profile_manager->GetNumberOfProfiles()); | 503 EXPECT_EQ(initial_profile_count, profile_manager->GetNumberOfProfiles()); |
| 496 // After destroying the incognito profile incognito preferences should be | 504 // After destroying the incognito profile incognito preferences should be |
| 497 // cleared so the default save path should be taken from the main profile. | 505 // cleared so the default save path should be taken from the main profile. |
| 498 EXPECT_FALSE(profile->GetOffTheRecordPrefs() | 506 EXPECT_FALSE(profile->GetOffTheRecordPrefs() |
| 499 ->GetFilePath(prefs::kSaveFileDefaultDirectory) | 507 ->GetFilePath(prefs::kSaveFileDefaultDirectory) |
| 500 .empty()); | 508 .empty()); |
| 501 } | 509 } |
| OLD | NEW |