| 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/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/message_loop/message_loop.h" |
| 12 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 14 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 15 #include "chrome/browser/lifetime/keep_alive_types.h" | 16 #include "chrome/browser/lifetime/keep_alive_types.h" |
| 16 #include "chrome/browser/lifetime/scoped_keep_alive.h" | 17 #include "chrome/browser/lifetime/scoped_keep_alive.h" |
| 17 #include "chrome/browser/password_manager/password_store_factory.h" | 18 #include "chrome/browser/password_manager/password_store_factory.h" |
| 18 #include "chrome/browser/profiles/profile_attributes_entry.h" | 19 #include "chrome/browser/profiles/profile_attributes_entry.h" |
| 19 #include "chrome/browser/profiles/profile_attributes_storage.h" | 20 #include "chrome/browser/profiles/profile_attributes_storage.h" |
| 20 #include "chrome/browser/profiles/profile_manager.h" | 21 #include "chrome/browser/profiles/profile_manager.h" |
| 21 #include "chrome/browser/profiles/profile_window.h" | 22 #include "chrome/browser/profiles/profile_window.h" |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 | 647 |
| 647 EXPECT_FALSE(profile->HasOffTheRecordProfile()); | 648 EXPECT_FALSE(profile->HasOffTheRecordProfile()); |
| 648 EXPECT_FALSE(profile_manager->IsValidProfile(incognito_profile)); | 649 EXPECT_FALSE(profile_manager->IsValidProfile(incognito_profile)); |
| 649 EXPECT_EQ(initial_profile_count, profile_manager->GetNumberOfProfiles()); | 650 EXPECT_EQ(initial_profile_count, profile_manager->GetNumberOfProfiles()); |
| 650 // After destroying the incognito profile incognito preferences should be | 651 // After destroying the incognito profile incognito preferences should be |
| 651 // cleared so the default save path should be taken from the main profile. | 652 // cleared so the default save path should be taken from the main profile. |
| 652 EXPECT_FALSE(profile->GetOffTheRecordPrefs() | 653 EXPECT_FALSE(profile->GetOffTheRecordPrefs() |
| 653 ->GetFilePath(prefs::kSaveFileDefaultDirectory) | 654 ->GetFilePath(prefs::kSaveFileDefaultDirectory) |
| 654 .empty()); | 655 .empty()); |
| 655 } | 656 } |
| OLD | NEW |