Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

chrome/browser/ui/webui/fileicon_source_unittest.cc

Index: chrome/browser/ui/webui/fileicon_source_unittest.cc
===================================================================
--- chrome/browser/ui/webui/fileicon_source_unittest.cc	(revision 176942)
+++ chrome/browser/ui/webui/fileicon_source_unittest.cc	(working copy)
@@ -20,10 +20,11 @@
  public:
   explicit TestFileIconSource() {}
 
-  MOCK_METHOD4(FetchFileIcon, void(const FilePath& path,
-                                   ui::ScaleFactor scale_factor,
-                                   IconLoader::IconSize icon_size,
-                                   int request_id));
+  MOCK_METHOD4(FetchFileIcon,
+               void(const FilePath& path,
+                    ui::ScaleFactor scale_factor,
+                    IconLoader::IconSize icon_size,
+                    const content::URLDataSource::GotDataCallback& callback));
 
   virtual ~TestFileIconSource() {}
 };
@@ -109,15 +110,22 @@
 #endif
 };
 
+// Test that the callback is NULL.
+MATCHER(CallbackIsNull, "") {
+  return arg.is_null();
+}
+
 }  // namespace
 
 TEST_F(FileIconSourceTest, FileIconSource_Parse) {
   for (unsigned i = 0; i < arraysize(kBasicExpectations); i++) {
     scoped_ptr<TestFileIconSource> source(CreateFileIconSource());
+    content::URLDataSource::GotDataCallback callback;
     EXPECT_CALL(*source.get(),
                 FetchFileIcon(FilePath(kBasicExpectations[i].unescaped_path),
                               kBasicExpectations[i].scale_factor,
-                              kBasicExpectations[i].size, i));
-    source->StartDataRequest(kBasicExpectations[i].request_path, false, i);
+                              kBasicExpectations[i].size, CallbackIsNull()));
+    source->StartDataRequest(kBasicExpectations[i].request_path, false,
+                             callback);
   }
 }