[content shell] ShellRenderProcessObserver no longer depends on WebTestInterfaces.

content/browser/fileapi/blob_layout_browsertest.cc

Index: content/browser/fileapi/blob_layout_browsertest.cc
diff --git a/content/browser/fileapi/blob_layout_browsertest.cc b/content/browser/fileapi/blob_layout_browsertest.cc
index 4f42c87a53b7e183fb89efe6da394f30094352e3..8188965240e031ac03f6a914c9049628b052a689 100644
--- a/content/browser/fileapi/blob_layout_browsertest.cc
+++ b/content/browser/fileapi/blob_layout_browsertest.cc
@@ -19,23 +19,15 @@ IN_PROC_BROWSER_TEST_F(BlobLayoutTest, SliceTests) {
   RunLayoutTest("blob-slice-test.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_ApplyBlobUrlToImg DISABLED_ApplyBlobUrlToImg
-#else
-# define MAYBE_ApplyBlobUrlToImg ApplyBlobUrlToImg
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_ApplyBlobUrlToImg) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_ApplyBlobUrlToImg) {
   RunLayoutTest("apply-blob-url-to-img.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_ApplyBlobUrlToXhr DISABLED_ApplyBlobUrlToXhr
-#else
-# define MAYBE_ApplyBlobUrlToXhr ApplyBlobUrlToXhr
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_ApplyBlobUrlToXhr) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_ApplyBlobUrlToXhr) {
   RunLayoutTest("apply-blob-url-to-xhr.html");
 }
 
@@ -62,33 +54,21 @@ IN_PROC_BROWSER_TEST_F(BlobLayoutTest,
   RunLayoutTest("domurl-script-execution-context-crash.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_FileListTest DISABLED_FileListTest
-#else
-# define MAYBE_FileListTest FileListTest
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_FileListTest) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_FileListTest) {
   RunLayoutTest("file-list-test.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_FileReaderAbort DISABLED_FileReaderAbort
-#else
-# define MAYBE_FileReaderAbort FileReaderAbort
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_FileReaderAbort) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_FileReaderAbort) {
   RunLayoutTest("file-reader-abort.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_FileReaderDirectoryCrash DISABLED_FileReaderDirectoryCrash
-#else
-# define MAYBE_FileReaderDirectoryCrash FileReaderDirectoryCrash
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_FileReaderDirectoryCrash) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_FileReaderDirectoryCrash) {
   RunLayoutTest("file-reader-directory-crash.html");
 }
 
@@ -96,13 +76,9 @@ IN_PROC_BROWSER_TEST_F(BlobLayoutTest, FileReaderDoneReadingAbort) {
   RunLayoutTest("file-reader-done-reading-abort.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_FileReaderEventListener DISABLED_FileReaderEventListener
-#else
-# define MAYBE_FileReaderEventListener FileReaderEventListener
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_FileReaderEventListener) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_FileReaderEventListener) {
   RunLayoutTest("file-reader-event-listener.html");
 }
 
@@ -128,33 +104,21 @@ IN_PROC_BROWSER_TEST_F(BlobLayoutTest, NotEnoughArguments) {
   RunLayoutTest("not-enough-arguments.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_NullOriginString DISABLED_NullOriginString
-#else
-# define MAYBE_NullOriginString NullOriginString
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_NullOriginString) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_NullOriginString) {
   RunLayoutTest("null-origin-string.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_ReadBlobAsync DISABLED_ReadBlobAsync
-#else
-# define MAYBE_ReadBlobAsync ReadBlobAsync
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_ReadBlobAsync) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_ReadBlobAsync) {
   RunLayoutTest("read-blob-async.html");
 }
 
-#if defined(OS_WIN)
-// http://crbug/169240
-# define MAYBE_ReadFileAsync DISABLED_ReadFileAsync
-#else
-# define MAYBE_ReadFileAsync ReadFileAsync
-#endif
-IN_PROC_BROWSER_TEST_F(BlobLayoutTest, MAYBE_ReadFileAsync) {
+// crbug.com/169240 for disabling on Windows, crbug.com/173079 for temporary
+// disabling everywhere.
+IN_PROC_BROWSER_TEST_F(BlobLayoutTest, DISABLED_ReadFileAsync) {
   RunLayoutTest("read-file-async.html");
 }