| Index: components/dom_distiller/core/fake_distiller.cc
|
| diff --git a/components/dom_distiller/core/fake_distiller.cc b/components/dom_distiller/core/fake_distiller.cc
|
| index e6cc9797a254ec9e4faeaf03e20e8c7f086a461d..a37c29aa50413761a931831110e0cef0cf8d0f9c 100644
|
| --- a/components/dom_distiller/core/fake_distiller.cc
|
| +++ b/components/dom_distiller/core/fake_distiller.cc
|
| @@ -21,10 +21,13 @@ FakeDistiller::FakeDistiller(bool execute_callback)
|
|
|
| FakeDistiller::~FakeDistiller() { Die(); }
|
|
|
| -void FakeDistiller::DistillPage(const GURL& url,
|
| - const DistillerCallback& callback) {
|
| +void FakeDistiller::DistillPage(
|
| + const GURL& url,
|
| + const DistillationFinishedCallback& article_callback,
|
| + const DistillationUpdateCallback& page_callback) {
|
| url_ = url;
|
| - callback_ = callback;
|
| + article_callback_ = article_callback;
|
| + page_callback_ = page_callback;
|
| if (execute_callback_) {
|
| scoped_ptr<DistilledArticleProto> proto(new DistilledArticleProto);
|
| proto->add_pages()->set_url(url_.spec());
|
| @@ -43,9 +46,9 @@ void FakeDistiller::RunDistillerCallback(
|
|
|
| void FakeDistiller::RunDistillerCallbackInternal(
|
| scoped_ptr<DistilledArticleProto> proto) {
|
| - EXPECT_FALSE(callback_.is_null());
|
| - callback_.Run(proto.Pass());
|
| - callback_.Reset();
|
| + EXPECT_FALSE(article_callback_.is_null());
|
| + article_callback_.Run(proto.Pass());
|
| + article_callback_.Reset();
|
| }
|
|
|
| } // namespace test
|
|
|