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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

Issue 367863005: No chrome dependencies in TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
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 "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/search_engines/template_url_service.h" 11 #include "chrome/browser/search_engines/template_url_service.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "chrome/browser/ui/app_list/app_list_util.h" 13 #include "chrome/browser/ui/app_list/app_list_util.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/browser_with_test_window_test.h" 16 #include "chrome/test/base/browser_with_test_window_test.h"
17 #include "chrome/test/base/scoped_testing_local_state.h" 17 #include "chrome/test/base/scoped_testing_local_state.h"
18 #include "chrome/test/base/testing_browser_process.h" 18 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_pref_service_syncable.h" 19 #include "chrome/test/base/testing_pref_service_syncable.h"
20 #include "components/bookmarks/test/bookmark_test_helpers.h" 20 #include "components/bookmarks/test/bookmark_test_helpers.h"
21 #include "components/search_engines/search_terms_data.h"
21 #include "ui/views/controls/button/label_button.h" 22 #include "ui/views/controls/button/label_button.h"
22 23
23 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { 24 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest {
24 public: 25 public:
25 BookmarkBarViewInstantExtendedTest() { 26 BookmarkBarViewInstantExtendedTest() {
26 } 27 }
27 28
28 protected: 29 protected:
29 virtual TestingProfile* CreateProfile() OVERRIDE { 30 virtual TestingProfile* CreateProfile() OVERRIDE {
30 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); 31 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
31 // TemplateURLService is normally NULL during testing. Instant extended 32 // TemplateURLService is normally NULL during testing. Instant extended
32 // needs this service so set a custom factory function. 33 // needs this service so set a custom factory function.
33 TemplateURLServiceFactory::GetInstance()->SetTestingFactory( 34 TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
34 profile, &BookmarkBarViewInstantExtendedTest::CreateTemplateURLService); 35 profile, &BookmarkBarViewInstantExtendedTest::CreateTemplateURLService);
35 return profile; 36 return profile;
36 } 37 }
37 38
38 private: 39 private:
39 static KeyedService* CreateTemplateURLService( 40 static KeyedService* CreateTemplateURLService(
40 content::BrowserContext* profile) { 41 content::BrowserContext* profile) {
41 return new TemplateURLService(static_cast<Profile*>(profile), NULL, 42 return new TemplateURLService(static_cast<Profile*>(profile)->GetPrefs(),
42 base::Closure()); 43 make_scoped_ptr(new SearchTermsData), NULL,
44 scoped_ptr<KeywordHistoryServiceInterface>(),
45 NULL, NULL, base::Closure());
43 } 46 }
44 47
45 DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewInstantExtendedTest); 48 DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewInstantExtendedTest);
46 }; 49 };
47 50
48 // Verify that in instant extended mode the visibility of the apps shortcut 51 // Verify that in instant extended mode the visibility of the apps shortcut
49 // button properly follows the pref value. 52 // button properly follows the pref value.
50 TEST_F(BookmarkBarViewInstantExtendedTest, AppsShortcutVisibility) { 53 TEST_F(BookmarkBarViewInstantExtendedTest, AppsShortcutVisibility) {
51 ScopedTestingLocalState local_state(TestingBrowserProcess::GetGlobal()); 54 ScopedTestingLocalState local_state(TestingBrowserProcess::GetGlobal());
52 profile()->CreateBookmarkModel(true); 55 profile()->CreateBookmarkModel(true);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar, 100 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
98 new base::FundamentalValue(false)); 101 new base::FundamentalValue(false));
99 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); 102 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
100 103
101 // And try showing it via policy too. 104 // And try showing it via policy too.
102 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar, 105 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
103 new base::FundamentalValue(true)); 106 new base::FundamentalValue(true));
104 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); 107 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
105 } 108 }
106 #endif 109 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698