Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1388)

Unified Diff: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

Issue 2412643002: Set enable_hangout_services_extension from branding. (Closed)
Patch Set: Fix 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
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 1b4c61b3c7ecd2f39e4caef6103d96046fc632b3..2463eb8f6e83672011839f6503a0ffce07f8e0ed 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
@@ -400,7 +400,7 @@ class HangoutServicesBrowserTest : public AudioWaitingExtensionTest {
}
};
-#if defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+#if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
IN_PROC_BROWSER_TEST_F(HangoutServicesBrowserTest,
RunComponentExtensionTest) {
// This runs the end-to-end JavaScript test for the Hangout Services
@@ -437,6 +437,6 @@ IN_PROC_BROWSER_TEST_F(HangoutServicesBrowserTest,
g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting(
NULL);
}
-#endif // defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
} // namespace extensions
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698