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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_unittest.cc

Issue 367863005: No chrome dependencies in TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename to TemplateURLServiceClient 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/search_engines/template_url_service.h" 5 #include "chrome/browser/search_engines/template_url_service.h"
6 #include "chrome/browser/search_engines/template_url_service_client.h"
6 #include "chrome/browser/search_engines/template_url_service_factory.h" 7 #include "chrome/browser/search_engines/template_url_service_factory.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
9 #include "chrome/test/base/browser_with_test_window_test.h" 10 #include "chrome/test/base/browser_with_test_window_test.h"
11 #include "components/search_engines/search_terms_data.h"
10 #include "content/public/browser/navigation_entry.h" 12 #include "content/public/browser/navigation_entry.h"
11 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
12 14
13 typedef BrowserWithTestWindowTest BookmarkTest; 15 typedef BrowserWithTestWindowTest BookmarkTest;
14 16
15 // Verify that the detached bookmark bar is visible on the new tab page. 17 // Verify that the detached bookmark bar is visible on the new tab page.
16 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) { 18 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) {
17 AddTab(browser(), GURL(chrome::kChromeUINewTabURL)); 19 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));
18 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state()); 20 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());
19 } 21 }
(...skipping 30 matching lines...) Expand all
50 // TemplateURLService is normally NULL during testing. Instant extended 52 // TemplateURLService is normally NULL during testing. Instant extended
51 // needs this service so set a custom factory function. 53 // needs this service so set a custom factory function.
52 TemplateURLServiceFactory::GetInstance()->SetTestingFactory( 54 TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
53 profile, &BookmarkInstantExtendedTest::CreateTemplateURLService); 55 profile, &BookmarkInstantExtendedTest::CreateTemplateURLService);
54 return profile; 56 return profile;
55 } 57 }
56 58
57 private: 59 private:
58 static KeyedService* CreateTemplateURLService( 60 static KeyedService* CreateTemplateURLService(
59 content::BrowserContext* profile) { 61 content::BrowserContext* profile) {
60 return new TemplateURLService(static_cast<Profile*>(profile), NULL, 62 return new TemplateURLService(
61 base::Closure()); 63 static_cast<Profile*>(profile)->GetPrefs(),
64 make_scoped_ptr(new SearchTermsData), NULL,
65 scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure());
62 } 66 }
63 67
64 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest); 68 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest);
65 }; 69 };
66 70
67 // Verify that in instant extended mode the detached bookmark bar is visible on 71 // Verify that in instant extended mode the detached bookmark bar is visible on
68 // the new tab page. 72 // the new tab page.
69 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) { 73 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) {
70 AddTab(browser(), GURL(chrome::kChromeUINewTabURL)); 74 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));
71 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state()); 75 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());
72 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698