Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc

Issue 1253953002: Componentize enhanced_bookmark_features.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert change in //chrome/common/DEPS that broke checkdeps Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 11 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
18 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h" 17 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
19 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h " 18 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h "
20 #include "components/dom_distiller/core/article_entry.h" 19 #include "components/dom_distiller/core/article_entry.h"
21 #include "components/dom_distiller/core/distilled_page_prefs.h" 20 #include "components/dom_distiller/core/distilled_page_prefs.h"
22 #include "components/dom_distiller/core/distiller.h" 21 #include "components/dom_distiller/core/distiller.h"
23 #include "components/dom_distiller/core/dom_distiller_service.h" 22 #include "components/dom_distiller/core/dom_distiller_service.h"
24 #include "components/dom_distiller/core/dom_distiller_store.h" 23 #include "components/dom_distiller/core/dom_distiller_store.h"
24 #include "components/dom_distiller/core/dom_distiller_switches.h"
25 #include "components/dom_distiller/core/dom_distiller_test_util.h" 25 #include "components/dom_distiller/core/dom_distiller_test_util.h"
26 #include "components/dom_distiller/core/fake_distiller.h" 26 #include "components/dom_distiller/core/fake_distiller.h"
27 #include "components/dom_distiller/core/fake_distiller_page.h" 27 #include "components/dom_distiller/core/fake_distiller_page.h"
28 #include "components/dom_distiller/core/task_tracker.h" 28 #include "components/dom_distiller/core/task_tracker.h"
29 #include "components/dom_distiller/core/url_constants.h" 29 #include "components/dom_distiller/core/url_constants.h"
30 #include "components/dom_distiller/core/url_utils.h" 30 #include "components/dom_distiller/core/url_utils.h"
31 #include "components/leveldb_proto/testing/fake_db.h" 31 #include "components/leveldb_proto/testing/fake_db.h"
32 #include "content/public/browser/render_view_host.h" 32 #include "content/public/browser/render_view_host.h"
33 #include "content/public/browser/url_data_source.h" 33 #include "content/public/browser/url_data_source.h"
34 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 EXPECT_EQ("dark sans-serif", result); 440 EXPECT_EQ("dark sans-serif", result);
441 441
442 distilled_page_prefs->SetFontFamily(DistilledPagePrefs::SERIF); 442 distilled_page_prefs->SetFontFamily(DistilledPagePrefs::SERIF);
443 base::RunLoop().RunUntilIdle(); 443 base::RunLoop().RunUntilIdle();
444 EXPECT_TRUE( 444 EXPECT_TRUE(
445 content::ExecuteScriptAndExtractString(contents, kGetBodyClass, &result)); 445 content::ExecuteScriptAndExtractString(contents, kGetBodyClass, &result));
446 EXPECT_EQ("dark serif", result); 446 EXPECT_EQ("dark serif", result);
447 } 447 }
448 448
449 } // namespace dom_distiller 449 } // namespace dom_distiller
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/enhanced_bookmarks_features.cc ('k') | chrome/browser/dom_distiller/profile_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698