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

chrome/browser/ui/webui/fileicon_source_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/fileicon_source.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class TestFileIconSource : public FileIconSource {
  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() {}
 };
 
 class FileIconSourceTest : public testing::Test {
  public:
   FileIconSourceTest()
       : loop_(MessageLoop::TYPE_UI),
         ui_thread_(BrowserThread::UI, MessageLoop::current()),
         file_thread_(BrowserThread::FILE, MessageLoop::current()) {}
@@ skipping 65 matching lines @@
     FILE_PATH_LITERAL("/foo/\xe0\xb6\x9a\xe0\xb6\xbb\xe0\xb7\x9d")
     FILE_PATH_LITERAL("\xe0\xb6\xb8\xe0\xb7\x8a"), ui::SCALE_FACTOR_100P,
     IconLoader::NORMAL },
   { "%2Ffoo%2Fbar", FILE_PATH_LITERAL("/foo/bar"), ui::SCALE_FACTOR_100P,
     IconLoader::NORMAL },
   { "%2Fbaz%20(1).txt?iconsize=small", FILE_PATH_LITERAL("/baz (1).txt"),
     ui::SCALE_FACTOR_100P, IconLoader::SMALL },
 #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);
   }
 }