| 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 "base/memory/weak_ptr.h" | 5 #include "base/memory/weak_ptr.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "components/dom_distiller/content/distiller_page_web_contents.h" | 9 #include "components/dom_distiller/content/distiller_page_web_contents.h" |
| 10 #include "components/dom_distiller/content/web_contents_main_frame_observer.h" | 10 #include "components/dom_distiller/content/web_contents_main_frame_observer.h" |
| 11 #include "components/dom_distiller/core/distiller_page.h" | 11 #include "components/dom_distiller/core/distiller_page.h" |
| 12 #include "content/public/browser/browser_context.h" | 12 #include "content/public/browser/browser_context.h" |
| 13 #include "content/public/browser/navigation_controller.h" | 13 #include "content/public/browser/navigation_controller.h" |
| 14 #include "content/public/browser/render_frame_host.h" | 14 #include "content/public/browser/render_frame_host.h" |
| 15 #include "content/public/browser/web_contents_observer.h" | 15 #include "content/public/browser/web_contents_observer.h" |
| 16 #include "content/public/test/content_browser_test.h" | 16 #include "content/public/test/content_browser_test.h" |
| 17 #include "content/shell/browser/shell.h" | 17 #include "content/shell/browser/shell.h" |
| 18 #include "grit/component_resources.h" | |
| 19 #include "net/test/embedded_test_server/embedded_test_server.h" | 18 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 19 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
| 22 | 21 |
| 23 using content::ContentBrowserTest; | 22 using content::ContentBrowserTest; |
| 24 using testing::ContainsRegex; | 23 using testing::ContainsRegex; |
| 25 using testing::HasSubstr; | 24 using testing::HasSubstr; |
| 26 using testing::Not; | 25 using testing::Not; |
| 27 | 26 |
| 28 namespace dom_distiller { | 27 namespace dom_distiller { |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 const DistilledPageInfo::MarkupImage& markup_image2 = markup_info.images[1]; | 397 const DistilledPageInfo::MarkupImage& markup_image2 = markup_info.images[1]; |
| 399 EXPECT_EQ("http://test/markup2.gif", markup_image2.url); | 398 EXPECT_EQ("http://test/markup2.gif", markup_image2.url); |
| 400 EXPECT_EQ("https://test/markup2.gif", markup_image2.secure_url); | 399 EXPECT_EQ("https://test/markup2.gif", markup_image2.secure_url); |
| 401 EXPECT_EQ("gif", markup_image2.type); | 400 EXPECT_EQ("gif", markup_image2.type); |
| 402 EXPECT_EQ("", markup_image2.caption); | 401 EXPECT_EQ("", markup_image2.caption); |
| 403 EXPECT_EQ(1000, markup_image2.width); | 402 EXPECT_EQ(1000, markup_image2.width); |
| 404 EXPECT_EQ(600, markup_image2.height); | 403 EXPECT_EQ(600, markup_image2.height); |
| 405 } | 404 } |
| 406 | 405 |
| 407 } // namespace dom_distiller | 406 } // namespace dom_distiller |
| OLD | NEW |