2 files changed, 31 insertions, 0 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index ae6f08a..6b40477 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -17,6 +17,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ -486,6 +487,26 @@ WebURL LocalFileToDataURL(const WebURL& fileUrl) {
   return WebURL(GURL(kDataUrlPrefix + contents_base64));
 }
 
+// A wrapper object for exporting ScopedTempDir to be used
+// by webkit layout tests.
+class ScopedTempDirectoryInternal : public ScopedTempDirectory {
+ public:
+   virtual bool CreateUniqueTempDir() {
+     return tempDirectory_.CreateUniqueTempDir();
+   }
+
+   virtual std::string path() const {
+     return tempDirectory_.path().MaybeAsASCII();
+   }
+
+ private:
+   ScopedTempDir tempDirectory_;
+};
+
+ScopedTempDirectory* CreateScopedTempDirectory() {
+  return new ScopedTempDirectoryInternal();
+}
+
 int64 GetCurrentTimeInMillisecond() {
   return base::TimeTicks::Now().ToInternalValue()
       / base::Time::kMicrosecondsPerMillisecond;
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 2482c87..d11f09b 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -154,6 +154,16 @@ bool SetCurrentDirectoryForFileURL(const WebKit::WebURL& fileUrl);
 // Convert a file:/// URL to a base64 encoded data: URL.
 WebKit::WebURL LocalFileToDataURL(const WebKit::WebURL& fileUrl);
 
+// Scoped temporary directories for use by webkit layout tests.
+class ScopedTempDirectory {
+ public:
+  virtual ~ScopedTempDirectory() {}
+  virtual bool CreateUniqueTempDir() = 0;
+  virtual std::string path() const = 0;
+};
+
+ScopedTempDirectory* CreateScopedTempDirectory();
+
 // -------- Time
 int64 GetCurrentTimeInMillisecond();