Index: chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc |
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc |
index e40f2e6a5c20011e789c4832378ddbc370e08786..27f5fe476bdba9ad87e25a5203522e5009363f9f 100644 |
--- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc |
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc |
@@ -10,6 +10,7 @@ |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/extensions/test_extension_system.h" |
+#include "chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h" |
#include "chrome/browser/media_galleries/media_galleries_permission_controller.h" |
#include "chrome/browser/media_galleries/media_galleries_preferences.h" |
#include "chrome/browser/media_galleries/media_galleries_test_util.h" |
@@ -36,38 +37,6 @@ std::string GalleryName(const MediaGalleryPrefInfo& gallery) { |
return base::UTF16ToASCII(name); |
} |
-class MockMediaGalleriesDialog |
- : public MediaGalleriesDialog { |
- public: |
- typedef base::Callback<void(int update_count)> DialogDestroyedCallback; |
- |
- explicit MockMediaGalleriesDialog(const DialogDestroyedCallback& callback) |
- : update_count_(0), |
- dialog_destroyed_callback_(callback) { |
- } |
- |
- virtual ~MockMediaGalleriesDialog() { |
- dialog_destroyed_callback_.Run(update_count_); |
- } |
- |
- // MockMediaGalleriesDialog implementation. |
- virtual void UpdateGalleries() OVERRIDE { |
- update_count_++; |
- } |
- |
- // Number of times UpdateResults has been called. |
- int update_count() { |
- return update_count_; |
- } |
- |
- private: |
- int update_count_; |
- |
- DialogDestroyedCallback dialog_destroyed_callback_; |
- |
- DISALLOW_COPY_AND_ASSIGN(MockMediaGalleriesDialog); |
-}; |
- |
} // namespace |
class MediaGalleriesPermissionControllerTest : public ::testing::Test { |