media: Remove kDisableInfobarForProtectedMediaIdentifier flag.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 818 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
   },
   {
     "disable-prefixed-encrypted-media",
     IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
     IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)
   },
-#if defined(OS_ANDROID)
-  {
-    "disable-infobar-for-protected-media-identifier",
-    IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_NAME,

[ddorwin, 2015/06/11 02:28:53]

You probably need to modify a .grd file too.

[xhwang, 2015/06/11 04:46:47]

Oops. Thanks for catching that! Done.

-    IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_DESCRIPTION,
-    kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kDisableInfobarForProtectedMediaIdentifier)
-  },
-#endif  // defined(OS_ANDROID)
   {
     "disable-javascript-harmony-shipping",
     IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME,
     IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)
   },
   {
     "enable-javascript-harmony",
     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME,
@@ skipping 2199 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags