chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc - Issue 720633003: Revert of CL 722703002 due to build breakage

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/extensions/api/media_galleries/media_galleries_apitest.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert Created 6 years, 1 month 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/extensions/api/management/chrome_management_api_delegate.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

index b531f2bfc8f9209bb22c4b72a37ccd4a0ca1aebd..e338991cea12aca8974da074ceec2921f644d685 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

@@ -21,15 +21,12 @@

#include "chrome/browser/media_galleries/media_galleries_scan_result_controller.h"

#include "chrome/browser/media_galleries/media_galleries_test_util.h"

#include "chrome/browser/media_galleries/media_scan_manager.h"

-#include "chrome/browser/ui/extensions/app_launch_params.h"

-#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/common/chrome_paths.h"

#include "components/storage_monitor/storage_info.h"

#include "components/storage_monitor/storage_monitor.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/test_utils.h"

#include "extensions/browser/extension_system.h"

-#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/test/result_catcher.h"

#include "media/base/test_data_util.h"

@@ -473,9 +470,10 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) {

ASSERT_TRUE(extension);

extensions::ResultCatcher catcher;

- AppLaunchParams params(browser()->profile(), extension,

- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,

- extensions::SOURCE_UNTRACKED);

+ AppLaunchParams params(browser()->profile(),

+ extension,

+ extensions::LAUNCH_CONTAINER_NONE,

+ NEW_WINDOW);

params.command_line = *CommandLine::ForCurrentProcess();

OpenApplication(params);