chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc - Issue 57813003: Reland: Convert ExtensionProcessManager to BrowserContext, part 1

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/system_indicator/system_indicator_apitest.cc

Issue 57813003: Reland: Convert ExtensionProcessManager to BrowserContext, part 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: disable on windows Created 7 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/runtime/runtime_api.cc ('k') | chrome/browser/extensions/chrome_extensions_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc

diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc

index 5b923cab8f53191ed918f67427efdb73e60ed568..4268a391ae1128f81793e165f69e09f2fba47508 100644

--- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc

+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc

@@ -11,8 +11,8 @@

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/lazy_background_page_test_util.h"

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

-#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

+#include "extensions/common/switches.h"

class SystemIndicatorApiTest : public ExtensionApiTest {

public:

@@ -20,8 +20,10 @@ class SystemIndicatorApiTest : public ExtensionApiTest {

ExtensionApiTest::SetUpCommandLine(command_line);

// Set shorter delays to prevent test timeouts in tests that need to wait

// for the event page to unload.

- command_line->AppendSwitchASCII(switches::kEventPageIdleTime, "1");

- command_line->AppendSwitchASCII(switches::kEventPageSuspendingTime, "1");

+ command_line->AppendSwitchASCII(

+ extensions::switches::kEventPageIdleTime, "1");

+ command_line->AppendSwitchASCII(

+ extensions::switches::kEventPageSuspendingTime, "1");

}

const extensions::Extension* LoadExtensionAndWait(