Remove CHROME_V8 #define and related javascript_engine gyp variable.

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2011 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/browser_about_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 42 matching lines @@
 #include "crypto/nss_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
-#ifdef CHROME_V8
-#include "v8/include/v8.h"
-#endif
-
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/oom_priority_manager.h"
@@ skipping 1019 matching lines @@
       IDR_ABOUT_VERSION_JS :
       IDR_ABOUT_VERSION_HTML).as_string();
 }
 
 std::string AboutVersionStrings(DictionaryValue* localized_strings,
                                 Profile* profile) {
   localized_strings->SetString("title",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_TITLE));
   chrome::VersionInfo version_info;
 
-  std::string webkit_version = webkit_glue::GetWebKitVersion();
-#ifdef CHROME_V8
-  std::string js_version(v8::V8::GetVersion());
-  std::string js_engine = "V8";
-#else
-  std::string js_version = webkit_version;
-  std::string js_engine = "JavaScriptCore";
-#endif
-
   localized_strings->SetString("name",
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   localized_strings->SetString("version", version_info.Version());
   // Bug 79458: Need to evaluate the use of getting the version string on
   // this thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   localized_strings->SetString("version_modifier",
                                chrome::VersionInfo::GetVersionStringModifier());
   localized_strings->SetString("os_name",
                                l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS));
   localized_strings->SetString("platform",
                                l10n_util::GetStringUTF16(IDS_PLATFORM_LABEL));
   localized_strings->SetString("os_type", version_info.OSType());
-  localized_strings->SetString("webkit_version", webkit_version);
-  localized_strings->SetString("js_engine", js_engine);
-  localized_strings->SetString("js_version", js_version);
+  localized_strings->SetString("webkit_version",
+                               webkit_glue::GetWebKitVersion());
+  localized_strings->SetString("js_engine", "V8");
+  localized_strings->SetString("js_version", v8::V8::GetVersion());
 
   // Obtain the version of the first enabled Flash plugin.
   std::vector<webkit::WebPluginInfo> info_array;
   webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
       GURL(), "application/x-shockwave-flash", false, NULL, &info_array, NULL);
   string16 flash_version =
       l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
   for (size_t i = 0; i < info_array.size(); ++i) {
     if (plugin_prefs->IsPluginEnabled(info_array[i])) {
       flash_version = info_array[i].version;
       break;
     }
   }
   localized_strings->SetString("flash_plugin", "Flash");
   localized_strings->SetString("flash_version", flash_version);
-  localized_strings->SetString("webkit_version", webkit_version);
   localized_strings->SetString("company",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMPANY_NAME));
   localized_strings->SetString("copyright",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT));
   localized_strings->SetString("cl", version_info.LastChange());
   localized_strings->SetString("official",
       l10n_util::GetStringUTF16(
           version_info.IsOfficialBuild() ?
               IDS_ABOUT_VERSION_OFFICIAL
             : IDS_ABOUT_VERSION_UNOFFICIAL));
@@ skipping 417 matching lines @@
   return false;
 }
 
 std::vector<std::string> ChromePaths() {
   std::vector<std::string> paths;
   paths.reserve(arraysize(kChromePaths));
   for (size_t i = 0; i < arraysize(kChromePaths); i++)
     paths.push_back(kChromePaths[i]);
   return paths;
 }