chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc - Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

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/media_galleries/media_galleries_apitest.cc

Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)

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

Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

index 2c322b5474eaa42d0efbe0091c101af30cede13f..9a0409a0c7622e250d6b913c790712c69656f5a0 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

@@ -35,7 +35,6 @@

#include "extensions/common/extension.h"

#include "extensions/test/result_catcher.h"

#include "media/base/test_data_util.h"

-#include "media/media_features.h"

#if defined(OS_WIN) || defined(OS_MACOSX)

#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"

@@ -464,7 +463,7 @@

AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3"));

base::ListValue custom_args;

-#if BUILDFLAG(USE_PROPRIETARY_CODECS)

+#if defined(USE_PROPRIETARY_CODECS)

custom_args.AppendBoolean(true);

#else

custom_args.AppendBoolean(false);

« no previous file with comments | « build/config/features.gni ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »