[Android] Update Protected Media Identifier Settings UI to reflect exceptions.

chrome/browser/media/protected_media_identifier_infobar_delegate.cc

 // Copyright 2013 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/media/protected_media_identifier_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_entry.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/chromium_application.h"
-#endif
-
-#if defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 #include "chrome/common/url_constants.h"
 #endif
 
 // static
 infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages) {
@@ skipping 75 matching lines @@
       IDS_PROTECTED_MEDIA_IDENTIFIER_ALLOW_BUTTON :
       IDS_PROTECTED_MEDIA_IDENTIFIER_DENY_BUTTON);
 }
 
 bool ProtectedMediaIdentifierInfoBarDelegate::Cancel() {
   SetPermission(true, false);
   return true;
 }
 
 base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetLinkText() const {
-#if defined(OS_ANDROID)
-  return l10n_util::GetStringUTF16(
-      IDS_PROTECTED_MEDIA_IDENTIFIER_SETTINGS_LINK);
-#else
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
-#endif
 }
 
 bool ProtectedMediaIdentifierInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-#if defined(OS_ANDROID)
-  chrome::android::ChromiumApplication::OpenProtectedContentSettings();
-#elif defined(OS_CHROMEOS)
   const GURL learn_more_url(chrome::kEnhancedPlaybackNotificationLearnMoreURL);

[newt (away), 2015/04/30 00:31:59]

why did you remove "#elif defined(OS_CHROMEOS)"? This changes the behavior on
other platforms, which doesn't seem intentional. Is this even used on other
platforms besides Android and Chrome OS?

[knn, 2015/04/30 16:00:36]

This entire class is only used in Android and Chrome OS. Since now there is no
different implementations for Android vs ChromeOS, I have removed the ugly
#ifdefs.

The Create method should be the ideal place for any NOTIMPLEMENTED() although I
think even that is excessive.

   InfoBarService::WebContentsFromInfoBar(infobar())
       ->OpenURL(content::OpenURLParams(
           learn_more_url, content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
-#else
-  NOTIMPLEMENTED();
-#endif
   return false; // Do not dismiss the info bar.
 }