chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc - Issue 16256023: Move systemInfo.memory API out of experimental 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/extensions/api/system_info_memory/system_info_memory_apitest.cc

Issue 16256023: Move systemInfo.memory API out of experimental namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolved merge conflict from new commits Created 7 years, 6 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/extensions/api/system_info_memory/system_info_memory_api.cc ('k') | chrome/browser/extensions/extension_function_histogram_value.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc

diff --git a/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc b/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc

index 8035b70937767af2934500fd40d24c364da2c51c..a101640f71c5178b1e9ca0f51b1826d03329dfc8 100644

--- a/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc

+++ b/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc

@@ -12,7 +12,9 @@

namespace extensions {

-using api::experimental_system_info_memory::MemoryInfo;

+using api::system_info_memory::MemoryInfo;

+const char kExtensionId[] = "lfmcnjhchhgejbpbonjobnlbcgcnmjif";

class MockMemoryInfoProviderImpl : public MemoryInfoProvider {

public:

@@ -34,7 +36,8 @@ class SystemInfoMemoryApiTest: public ExtensionApiTest {

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

ExtensionApiTest::SetUpCommandLine(command_line);

- command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);

+ command_line->AppendSwitchASCII(switches::kWhitelistedExtensionID,

+ kExtensionId);

}

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {