chrome/browser/chromeos/file_manager/file_manager_browsertest.cc - Issue 819133004: Make callers of CommandLine use it via the base:: namespace.

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/chromeos/file_manager/file_manager_browsertest.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 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

« no previous file with comments | « chrome/browser/chromeos/file_manager/file_browser_handlers.cc ('k') | chrome/browser/chromeos/file_manager/file_tasks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

index e1f50b7eecf201f58ce6c694e416eb8c39dfffb1..08ce74e84034c3a0802edf408bd90666b5b85f3b 100644

--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -539,7 +539,7 @@ class FileManagerBrowserTestBase : public ExtensionApiTest {

virtual void SetUpOnMainThread() override;

// Adds an incognito and guest-mode flags for tests in the guest mode.

- virtual void SetUpCommandLine(CommandLine* command_line) override;

+ virtual void SetUpCommandLine(base::CommandLine* command_line) override;

// Loads our testing extension and sends it a string identifying the current

// test.

@@ -603,7 +603,8 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {

net::NetworkChangeNotifier::SetTestNotificationsOnly(true);

}

-void FileManagerBrowserTestBase::SetUpCommandLine(CommandLine* command_line) {

+void FileManagerBrowserTestBase::SetUpCommandLine(

+ base::CommandLine* command_line) {

if (GetGuestModeParam() == IN_GUEST_MODE) {

command_line->AppendSwitch(chromeos::switches::kGuestSession);

command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "");

@@ -1170,7 +1171,7 @@ static const TestAccountInfo kTestAccounts[] = {

class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {

protected:

// Enables multi-profiles.

- virtual void SetUpCommandLine(CommandLine* command_line) override {

+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {

FileManagerBrowserTestBase::SetUpCommandLine(command_line);

// Logs in to a dummy profile (For making MultiProfileWindowManager happy;

// browser test creates a default window and the manager tries to assign a

@@ -1500,7 +1501,7 @@ class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase {

FileManagerBrowserTestBase::SetUp();

}

- virtual void SetUpCommandLine(CommandLine* command_line) override {

+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {

command_line->AppendSwitch(

chromeos::switches::kEnableVideoPlayerChromecastSupport);

FileManagerBrowserTestBase::SetUpCommandLine(command_line);