chrome/browser/ui/global_error/global_error_service_browsertest.cc - Issue 2409443002: Make GlobalErrorService's ownership model slightly less insane.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/global_error/global_error_service_browsertest.cc

Issue 2409443002: Make GlobalErrorService's ownership model slightly less insane. (Closed)

Patch Set: deprecation notice Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/safe_browsing/srt_global_error_win.cc ('K') | « chrome/browser/ui/global_error/global_error_service.cc ('k') | chrome/browser/ui/global_error/global_error_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/global_error/global_error_service_browsertest.cc

diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc

index 8ce652662a57fedf99d20013a9f2e04a7c75cda1..d7116a347e5070b5e9ab0c8b4ef5be2900b12d49 100644

--- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc

+++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc

@@ -7,6 +7,7 @@

#include <memory>

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "build/build_config.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/global_error/global_error.h"

@@ -71,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, ShowBubbleView) {

GlobalErrorService* service =

GlobalErrorServiceFactory::GetForProfile(browser()->profile());

- service->AddGlobalError(error);

+ service->AddGlobalError(base::WrapUnique(error));

EXPECT_EQ(error, service->GetFirstGlobalErrorWithBubbleView());

EXPECT_FALSE(error->HasShownBubbleView());

@@ -92,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, CloseBubbleView) {

GlobalErrorService* service =

GlobalErrorServiceFactory::GetForProfile(browser()->profile());

- service->AddGlobalError(error);

+ service->AddGlobalError(base::WrapUnique(error));

EXPECT_EQ(error, service->GetFirstGlobalErrorWithBubbleView());

EXPECT_FALSE(error->HasShownBubbleView());

@@ -125,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest,

GlobalErrorService* service =

GlobalErrorServiceFactory::GetForProfile(browser()->profile());

- service->AddGlobalError(error.get());

+ service->AddUnownedGlobalError(error.get());

EXPECT_EQ(error.get(), service->GetFirstGlobalErrorWithBubbleView());

error->ShowBubbleView(browser());

@@ -135,8 +136,7 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest,

// Removing |error| from profile should dismiss the bubble view without

// calling |error->BubbleViewDidClose|.

- service->RemoveGlobalError(error.get());

+ service->RemoveUnownedGlobalError(error.get());

content::RunAllPendingInMessageLoop();

EXPECT_EQ(1, error->bubble_view_close_count());

- // |error| is no longer owned by service and will be deleted.

}