4 files changed, 1 insertions, 28 deletions
diff --git a/content/common/content_paths.cc b/content/common/content_paths.cc
index 2664349..4e9b32b 100644
--- a/content/common/content_paths.cc
+++ b/content/common/content_paths.cc
@@ -4,7 +4,6 @@
 
 #include "content/common/content_paths.h"
 
-#include "base/file_util.h"
 #include "base/path_service.h"
 
 namespace content {
@@ -13,22 +12,8 @@ bool PathProvider(int key, FilePath* result) {
   switch (key) {
     case CHILD_PROCESS_EXE:
       return PathService::Get(base::FILE_EXE, result);
-    case DIR_TEST_DATA: {
-      FilePath cur;
-      if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
-        return false;
-      cur = cur.Append(FILE_PATH_LITERAL("content"));
-      cur = cur.Append(FILE_PATH_LITERAL("test"));
-      cur = cur.Append(FILE_PATH_LITERAL("data"));
-      if (!file_util::PathExists(cur))  // we don't want to create this
-        return false;
-
-      *result = cur;
-      return true;
-      break;
-    }
     default:
-      return false;
+      break;
   }
 
   return false;
diff --git a/content/common/content_paths.h b/content/common/content_paths.h
index cdf07a7..49720a0 100644
--- a/content/common/content_paths.h
+++ b/content/common/content_paths.h
@@ -17,9 +17,6 @@ enum {
   // Path and filename to the executable to use for child processes.
   CHILD_PROCESS_EXE = PATH_START,
 
-  // Valid only in development environment
-  DIR_TEST_DATA,
-
   PATH_END
 };
 
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 4058d4e..20dca2a 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -471,11 +471,6 @@ const char kAuditHandles[]                  = "enable-handle-auditing";
 const char kAuditAllHandles[]               = "enable-handle-auditing-all";
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-// Specify the amount the trackpad should scroll by.
-const char kScrollPixels[]                  = "scroll-pixels";
-#endif
-
 #if !defined(OFFICIAL_BUILD)
 // Causes the renderer process to throw an assertion on launch.
 const char kRendererCheckFalseTest[]        = "renderer-check-false-test";
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index adc93dd..a61a35b 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -152,10 +152,6 @@ extern const char kAuditHandles[];
 extern const char kAuditAllHandles[];
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-extern const char kScrollPixels[];
-#endif
-
 #if !defined(OFFICIAL_BUILD)
 extern const char kRendererCheckFalseTest[];
 #endif