chrome/browser/power/process_power_collector_unittest.cc - Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file.

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/power/process_power_collector_unittest.cc

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 2 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/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc ('k') | chrome/browser/sessions/better_session_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/power/process_power_collector_unittest.cc

diff --git a/chrome/browser/power/process_power_collector_unittest.cc b/chrome/browser/power/process_power_collector_unittest.cc

index 09424e49f6e3246ff5f5672465b02e8be81f6f54..d11abb03e064d0458c3803b54f8fe67bd61cc235 100644

--- a/chrome/browser/power/process_power_collector_unittest.cc

+++ b/chrome/browser/power/process_power_collector_unittest.cc

@@ -4,7 +4,7 @@

#include "chrome/browser/power/process_power_collector.h"

-#include "chrome/browser/apps/scoped_keep_alive.h"

+#include "chrome/browser/lifetime/browser_keep_alive.h"

#include "chrome/browser/profiles/profile_manager.h"

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

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

@@ -270,7 +270,8 @@ TEST_F(BrowserProcessPowerTest, AppsRecordPowerUsage) {

profile_manager_->CreateTestingProfile("Test user");

GURL url("chrome-extension://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");

extensions::AppWindow* window = new extensions::AppWindow(

- current_profile, new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>()),

+ current_profile,

+ new ChromeAppDelegate(scoped_ptr<browser_lifetime::ScopedKeepAlive>()),

extension.get());

content::WebContents* web_contents(

content::WebContents::Create(content::WebContents::CreateParams(