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

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
===================================================================
--- webkit/tools/test_shell/test_shell.cc	(revision 14606)
+++ webkit/tools/test_shell/test_shell.cc	(working copy)
@@ -582,11 +582,9 @@
   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");
@@ -596,11 +594,9 @@
   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) {
@@ -610,17 +606,14 @@
   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;
@@ -638,6 +631,5 @@
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
-#endif
 
 }  // namespace webkit_glue