| Index: chrome/browser/ui/webui/profile_helper_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/profile_helper_browsertest.cc b/chrome/browser/ui/webui/profile_helper_browsertest.cc
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..c39f6b9127a6e0f4f8ab6ace183145e00d71cc6e
|
| --- /dev/null
|
| +++ b/chrome/browser/ui/webui/profile_helper_browsertest.cc
|
| @@ -0,0 +1,217 @@
|
| +// Copyright 2017 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/memory/ptr_util.h"
|
| +#include "base/run_loop.h"
|
| +#include "base/scoped_observer.h"
|
| +#include "chrome/browser/browser_process.h"
|
| +#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
|
| +#include "chrome/browser/chrome_notification_types.h"
|
| +#include "chrome/browser/profiles/profile_attributes_storage.h"
|
| +#include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/ui/browser_list_observer.h"
|
| +#include "chrome/browser/ui/webui/profile_helper.h"
|
| +#include "chrome/test/base/in_process_browser_test.h"
|
| +#include "content/public/browser/notification_service.h"
|
| +#include "content/public/test/test_utils.h"
|
| +#include "content/public/test/test_web_ui.h"
|
| +
|
| +namespace {
|
| +
|
| +// An observer that returns back to test code after a new profile is
|
| +// initialized.
|
| +void UnblockOnProfileCreation(base::RunLoop* run_loop,
|
| + Profile* profile,
|
| + Profile::CreateStatus status) {
|
| + if (status == Profile::CREATE_STATUS_INITIALIZED)
|
| + run_loop->Quit();
|
| +}
|
| +
|
| +Profile* CreateProfile() {
|
| + ProfileManager* profile_manager = g_browser_process->profile_manager();
|
| + base::FilePath new_path = profile_manager->GenerateNextProfileDirectoryPath();
|
| + base::RunLoop run_loop;
|
| + profile_manager->CreateProfileAsync(
|
| + new_path, base::Bind(&UnblockOnProfileCreation, &run_loop),
|
| + base::string16(), std::string(), std::string());
|
| + run_loop.Run();
|
| + return profile_manager->GetProfileByPath(new_path);
|
| +}
|
| +
|
| +// An observer returns back to test code after brower window associated with
|
| +// the profile is activated.
|
| +class ExpectBrowserActivationForProfile : public chrome::BrowserListObserver {
|
| + public:
|
| + explicit ExpectBrowserActivationForProfile(Profile* profile)
|
| + : profile_(profile), scoped_observer_(this) {
|
| + scoped_observer_.Add(BrowserList::GetInstance());
|
| + }
|
| +
|
| + void Wait() {
|
| + loop_.Run();
|
| + }
|
| +
|
| + protected:
|
| + void OnBrowserSetLastActive(Browser* browser) override {
|
| + if (browser->profile() == profile_)
|
| + loop_.Quit();
|
| + }
|
| +
|
| + private:
|
| + Profile* profile_;
|
| + base::RunLoop loop_;
|
| + ScopedObserver<BrowserList, chrome::BrowserListObserver> scoped_observer_;
|
| +};
|
| +
|
| +// TODO(bug 704601): remove it when bug is fixed.
|
| +class BrowsingDataRemoverObserver
|
| + : public BrowsingDataRemoverImpl::CompletionInhibitor {
|
| + public:
|
| + explicit BrowsingDataRemoverObserver(const base::Closure& callback)
|
| + : callback_(callback) {
|
| + BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(this);
|
| + }
|
| + ~BrowsingDataRemoverObserver() {
|
| + BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(nullptr);
|
| + }
|
| +
|
| + private:
|
| + void OnBrowsingDataRemoverWouldComplete(
|
| + BrowsingDataRemoverImpl* remover,
|
| + const base::Closure& continue_to_completion) override {
|
| + continue_to_completion.Run();
|
| + callback_.Run();
|
| + }
|
| +
|
| + const base::Closure callback_;
|
| +};
|
| +
|
| +} // namespace
|
| +
|
| +using ProfileHelperTest = InProcessBrowserTest;
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, OpenNewWindowForProfile) {
|
| + BrowserList* browser_list = BrowserList::GetInstance();
|
| +
|
| + Browser* original_browser = browser();
|
| + Profile* original_profile = original_browser->profile();
|
| + std::unique_ptr<ExpectBrowserActivationForProfile> activation_observer;
|
| +
|
| + // Sanity checks.
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
|
| +
|
| + // Opening existing browser profile shouldn't open additional browser windows.
|
| + webui::OpenNewWindowForProfile(original_profile);
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_EQ(original_browser, browser_list->GetLastActive());
|
| +
|
| + // Open additional browser will add new window and activates it.
|
| + Profile* additional_profile = CreateProfile();
|
| + activation_observer =
|
| + base::MakeUnique<ExpectBrowserActivationForProfile>(additional_profile);
|
| + webui::OpenNewWindowForProfile(additional_profile);
|
| + EXPECT_EQ(2u, browser_list->size());
|
| + activation_observer->Wait();
|
| + EXPECT_EQ(additional_profile, browser_list->GetLastActive()->profile());
|
| +
|
| +// On Macs OpenNewWindowForProfile does not activate existing browser
|
| +// while non of the browser windows have focus. BrowserWindowCocoa::Show() got
|
| +// the same issue as BrowserWindowCocoa::Activate(), and execute call
|
| +// BrowserList::SetLastActive() directly. Not sure if it is a bug or desired
|
| +// behaviour.
|
| +#if !defined(OS_MACOSX)
|
| + // Switch to original browser. Only LastActive should change.
|
| + activation_observer =
|
| + base::MakeUnique<ExpectBrowserActivationForProfile>(original_profile);
|
| + webui::OpenNewWindowForProfile(original_profile);
|
| + EXPECT_EQ(2u, browser_list->size());
|
| + activation_observer->Wait();
|
| + EXPECT_EQ(original_profile, browser_list->GetLastActive()->profile());
|
| +#endif
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, DeleteSoleProfile) {
|
| + content::TestWebUI web_ui;
|
| + Browser* original_browser = browser();
|
| + ProfileAttributesStorage& storage =
|
| + g_browser_process->profile_manager()->GetProfileAttributesStorage();
|
| +
|
| + BrowserList* browser_list = BrowserList::GetInstance();
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +
|
| + // Original browser will be closed, and browser with the new profile created.
|
| + content::WindowedNotificationObserver open_observer(
|
| + chrome::NOTIFICATION_BROWSER_OPENED,
|
| + content::NotificationService::AllSources());
|
| + content::WindowedNotificationObserver close_observer(
|
| + chrome::NOTIFICATION_BROWSER_CLOSED, content::Source<Browser>(browser()));
|
| + webui::DeleteProfileAtPath(original_browser->profile()->GetPath(), &web_ui,
|
| + ProfileMetrics::DELETE_PROFILE_SETTINGS);
|
| + open_observer.Wait();
|
| + close_observer.Wait();
|
| +
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_FALSE(base::ContainsValue(*browser_list, original_browser));
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, DeleteActiveProfile) {
|
| + content::TestWebUI web_ui;
|
| + Browser* original_browser = browser();
|
| + ProfileAttributesStorage& storage =
|
| + g_browser_process->profile_manager()->GetProfileAttributesStorage();
|
| +
|
| + BrowserList* browser_list = BrowserList::GetInstance();
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +
|
| + Profile* additional_profile = CreateProfile();
|
| + EXPECT_EQ(2u, storage.GetNumberOfProfiles());
|
| +
|
| + // Original browser will be closed, and browser with the new profile created.
|
| + content::WindowedNotificationObserver open_observer(
|
| + chrome::NOTIFICATION_BROWSER_OPENED,
|
| + content::NotificationService::AllSources());
|
| + content::WindowedNotificationObserver close_observer(
|
| + chrome::NOTIFICATION_BROWSER_CLOSED, content::Source<Browser>(browser()));
|
| + webui::DeleteProfileAtPath(original_browser->profile()->GetPath(), &web_ui,
|
| + ProfileMetrics::DELETE_PROFILE_SETTINGS);
|
| + open_observer.Wait();
|
| + close_observer.Wait();
|
| +
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_EQ(additional_profile, browser_list->get(0)->profile());
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ProfileHelperTest, DeleteInactiveProfile) {
|
| + content::TestWebUI web_ui;
|
| + Browser* original_browser = browser();
|
| + ProfileAttributesStorage& storage =
|
| + g_browser_process->profile_manager()->GetProfileAttributesStorage();
|
| +
|
| + BrowserList* browser_list = BrowserList::GetInstance();
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +
|
| + Profile* additional_profile = CreateProfile();
|
| + EXPECT_EQ(2u, storage.GetNumberOfProfiles());
|
| +
|
| + base::RunLoop loop;
|
| + BrowsingDataRemoverObserver observer(loop.QuitClosure());
|
| + webui::DeleteProfileAtPath(additional_profile->GetPath(), &web_ui,
|
| + ProfileMetrics::DELETE_PROFILE_SETTINGS);
|
| + loop.Run();
|
| +
|
| + EXPECT_EQ(1u, browser_list->size());
|
| + EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
|
| + EXPECT_EQ(1u, storage.GetNumberOfProfiles());
|
| +}
|
|
|