chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc - Issue 2405013002: Move some global feature defines to buildflags

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/webrtc_audio_private/webrtc_audio_private_browsertest.cc

Issue 2405013002: Move some global feature defines to buildflags (Closed)

Patch Set: Comment Created 4 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/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

index 8c3c475fc6585c7423fd89f2d44e196e5e0dde52..1b4c61b3c7ecd2f39e4caef6103d96046fc632b3 100644

--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"

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

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

+#include "chrome/common/features.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "chrome/test/base/ui_test_utils.h"

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

@@ -399,7 +400,7 @@ class HangoutServicesBrowserTest : public AudioWaitingExtensionTest {

}

};

-#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)

+#if defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)

IN_PROC_BROWSER_TEST_F(HangoutServicesBrowserTest,

RunComponentExtensionTest) {

// This runs the end-to-end JavaScript test for the Hangout Services

@@ -436,6 +437,6 @@ IN_PROC_BROWSER_TEST_F(HangoutServicesBrowserTest,

g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting(

NULL);

}

-#endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)

+#endif // defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)

} // namespace extensions