chrome/browser/ui/ash/volume_controller_browsertest_chromeos.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/volume_controller_browsertest_chromeos.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/system_tray_tray_cast_browsertest_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

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

index 22d710ac7f7f7fece0a29493c8096e068bbf7bc0..11b4be4c5fcf0347dab3f856677037162b21fede 100644

--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

@@ -2,13 +2,13 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include <memory>

#include <vector>

#include "ash/accessibility_delegate.h"

#include "ash/ash_switches.h"

#include "base/command_line.h"

#include "base/macros.h"

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

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

@@ -89,7 +89,7 @@ class VolumeControllerTest : public InProcessBrowserTest {

chromeos::CrasAudioHandler* audio_handler_; // Not owned.

private:

- scoped_ptr<VolumeController> volume_controller_;

+ std::unique_ptr<VolumeController> volume_controller_;

DISALLOW_COPY_AND_ASSIGN(VolumeControllerTest);

};