| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <string.h> | 5 #include <string.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/guid.h" | 8 #include "base/guid.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 12 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/browser_navigator_params.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/common/chrome_isolated_world_ids.h" | 17 #include "chrome/common/chrome_isolated_world_ids.h" |
| 17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
| 19 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 20 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h" | 21 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h" |
| 21 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h
" | 22 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h
" |
| 22 #include "components/dom_distiller/core/article_entry.h" | 23 #include "components/dom_distiller/core/article_entry.h" |
| 23 #include "components/dom_distiller/core/distilled_page_prefs.h" | 24 #include "components/dom_distiller/core/distilled_page_prefs.h" |
| 24 #include "components/dom_distiller/core/distiller.h" | 25 #include "components/dom_distiller/core/distiller.h" |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 EXPECT_EQ("dark serif", result); | 610 EXPECT_EQ("dark serif", result); |
| 610 EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor()); | 611 EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor()); |
| 611 | 612 |
| 612 EXPECT_TRUE(content::ExecuteScriptAndExtractString( | 613 EXPECT_TRUE(content::ExecuteScriptAndExtractString( |
| 613 contents, kGetFontSize, &result)); | 614 contents, kGetFontSize, &result)); |
| 614 base::StringToDouble(result, &fontSize); | 615 base::StringToDouble(result, &fontSize); |
| 615 ASSERT_FLOAT_EQ(kScale, fontSize/oldFontSize); | 616 ASSERT_FLOAT_EQ(kScale, fontSize/oldFontSize); |
| 616 } | 617 } |
| 617 | 618 |
| 618 } // namespace dom_distiller | 619 } // namespace dom_distiller |
| OLD | NEW |