chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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/ash/launcher/launcher_favicon_loader_browsertest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 months 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_favicon_loader.h ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

index c8d19765202b49e171e4ff98154bf5b5b1a4e937..822900bf1436ef38a65f105e7a661fdc874253a9 100644

--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

@@ -6,9 +6,10 @@

#include <stdint.h>

+#include <memory>

#include "ash/shelf/shelf_constants.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/strings/stringprintf.h"

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

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

@@ -122,8 +123,8 @@ class LauncherFaviconLoaderBrowsertest

}

bool favicon_updated_;

- scoped_ptr<ContentsObserver> contents_observer_;

- scoped_ptr<LauncherFaviconLoader> favicon_loader_;

+ std::unique_ptr<ContentsObserver> contents_observer_;

+ std::unique_ptr<LauncherFaviconLoader> favicon_loader_;

private:

DISALLOW_COPY_AND_ASSIGN(LauncherFaviconLoaderBrowsertest);