More linux ifdef tweaks. This reverts my earlier change (13503)....

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 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 "v8_proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
@@ skipping 564 matching lines @@
 bool IsMediaPlayerAvailable() {
   return g_media_player_available;
 }
 
 void PrecacheUrl(const char16* url, int url_length) {}
 
 void AppendToLog(const char* file, int line, const char* msg) {
   logging::LogMessage(file, line).stream() << msg;
 }
 
-#if !defined(LINUX2)
 bool GetApplicationDirectory(std::wstring *path) {
   return PathService::Get(base::DIR_EXE, path);
 }
-#endif
 
 GURL GetInspectorURL() {
   return GURL("test-shell-resource://inspector/inspector.html");
 }
 
 std::string GetUIResourceProtocol() {
   return "test-shell-resource";
 }
 
-#if !defined(LINUX2)
 bool GetExeDirectory(std::wstring *path) {
   return PathService::Get(base::DIR_EXE, path);
 }
-#endif
 
 bool SpellCheckWord(const wchar_t* word, int word_len,
                     int* misspelling_start, int* misspelling_len) {
   // Report all words being correctly spelled.
   *misspelling_start = 0;
   *misspelling_len = 0;
   return true;
 }
 
-#if !defined(LINUX2)
 bool IsPluginRunningInRendererProcess() {
   return true;
 }
-#endif
 
 bool GetPluginFinderURL(std::string* plugin_finder_url) {
   return false;
 }
 
-#if !defined(LINUX2)
 bool IsDefaultPluginEnabled() {
 #if defined(OS_WIN)
   FilePath exe_path;
 
   if (PathService::Get(base::FILE_EXE, &exe_path)) {
     std::wstring exe_name = file_util::GetFilenameFromPath(
         exe_path.ToWStringHack());
     if (StartsWith(exe_name, L"test_shell_tests", false))
       return true;
   }
 #endif  // OS_WIN
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
-#endif
 
 }  // namespace webkit_glue