Revert 43443 - Add Flash EULA to about box on Mac (for branded builds).

BUG=none
TEST=On Chromium, about box should be the same as before. On Google Chrome, about box should have "Adobe Flash Player License Agreement" below the Google Terms of Service, with "License Agreement" an appropriate link.

Review URL: http://codereview.chromium.org/1610001

TBR=viettrungluu@chromium.org, cpu@chromium.org, dhollowa@chromium.org
Review URL: http://codereview.chromium.org/1574022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44109 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 24 deletions

diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm
index 80447fb..6a2537e 100644
--- a/chrome/browser/cocoa/about_window_controller.mm
+++ b/chrome/browser/cocoa/about_window_controller.mm
@@ -756,12 +756,11 @@ static BOOL recentShownUserActionFailedStatus = NO;
   AttributedStringAppendString(legal_block, sub_str);
 
 #if defined(GOOGLE_CHROME_BUILD)
-  // Only display Terms of Service and the Flash EULA for Google Chrome.
+  // Terms of service is only valid for Google Chrome
 
-  // Google Terms of Service.
   // The url within terms should point here:
   NSString* kTOS = [NSString stringWithUTF8String:chrome::kAboutTermsURL];
-  // Following Windows. There is one marker in the string for where the terms
+  // Following Window. There is one marker in the string for where the terms
   // link goes, but the text of the link comes from a second string resources.
   std::vector<size_t> url_offsets;
   std::wstring w_about_terms = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE,
@@ -779,27 +778,6 @@ static BOOL recentShownUserActionFailedStatus = NO;
   AttributedStringAppendHyperlink(legal_block, terms_link_text, kTOS);
   sub_str = [about_terms substringFromIndex:url_offsets[0]];
   AttributedStringAppendString(legal_block, sub_str);
-
-  // Adobe Flash Player EULA.
-  // The url within terms should point here:
-  NSString* fl_eula_url = l10n_util::GetNSString(IDS_FLASH_EULA_URL);
-  // Following Windows. There is one marker in the string for where the terms
-  // link goes, but the text of the link comes from a second string resources.
-  std::vector<size_t> fl_eula_url_offsets;
-  std::wstring w_fl_eula_text = l10n_util::GetStringF(IDS_ABOUT_FLASH_EULA,
-                                                      std::wstring(),
-                                                      std::wstring(),
-                                                      &fl_eula_url_offsets);
-  DCHECK_EQ(fl_eula_url_offsets.size(), 1U);
-  NSString* fl_eula_text = base::SysWideToNSString(w_fl_eula_text);
-  NSString* fl_eula_link_text = l10n_util::GetNSStringWithFixup(IDS_FLASH_EULA);
-
-  AttributedStringAppendString(legal_block, @"\n");
-  sub_str = [fl_eula_text substringToIndex:fl_eula_url_offsets[0]];
-  AttributedStringAppendString(legal_block, sub_str);
-  AttributedStringAppendHyperlink(legal_block, fl_eula_link_text, fl_eula_url);
-  sub_str = [fl_eula_text substringFromIndex:fl_eula_url_offsets[0]];
-  AttributedStringAppendString(legal_block, sub_str);
 #endif  // GOOGLE_CHROME_BUILD
 
   // We need to explicitly select Lucida Grande because once we click on