OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
| 5 #include <stddef.h> |
| 6 |
5 #include <algorithm> | 7 #include <algorithm> |
6 #include <map> | 8 #include <map> |
7 #include <string> | 9 #include <string> |
8 #include <vector> | 10 #include <vector> |
9 | 11 |
10 #include "base/bind.h" | 12 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
12 #include "base/location.h" | 14 #include "base/location.h" |
| 15 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
14 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
15 #include "base/single_thread_task_runner.h" | 18 #include "base/single_thread_task_runner.h" |
16 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
17 #include "base/thread_task_runner_handle.h" | 20 #include "base/thread_task_runner_handle.h" |
18 #include "base/values.h" | 21 #include "base/values.h" |
19 #include "components/dom_distiller/core/article_distillation_update.h" | 22 #include "components/dom_distiller/core/article_distillation_update.h" |
20 #include "components/dom_distiller/core/distiller.h" | 23 #include "components/dom_distiller/core/distiller.h" |
21 #include "components/dom_distiller/core/distiller_page.h" | 24 #include "components/dom_distiller/core/distiller_page.h" |
22 #include "components/dom_distiller/core/fake_distiller_page.h" | 25 #include "components/dom_distiller/core/fake_distiller_page.h" |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
693 | 696 |
694 ASSERT_TRUE(distiller_page); | 697 ASSERT_TRUE(distiller_page); |
695 // Post the task to execute javascript and then delete the distiller. | 698 // Post the task to execute javascript and then delete the distiller. |
696 distiller_page->OnDistillationDone(GURL(kURL), distilled_value.get()); | 699 distiller_page->OnDistillationDone(GURL(kURL), distilled_value.get()); |
697 distiller_.reset(); | 700 distiller_.reset(); |
698 | 701 |
699 base::MessageLoop::current()->RunUntilIdle(); | 702 base::MessageLoop::current()->RunUntilIdle(); |
700 } | 703 } |
701 | 704 |
702 } // namespace dom_distiller | 705 } // namespace dom_distiller |
OLD | NEW |