chrome/browser/ui/bookmarks/bookmark_unittest.cc - Issue 367023002: Componentize TemplateURLService

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 367023002: Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc ('k') | chrome/browser/ui/cocoa/first_run_bubble_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

6 #include "chrome/browser/search_engines/template_url_service_client.h"

7 #include "chrome/browser/search_engines/template_url_service_factory.h"	5 #include "chrome/browser/search_engines/template_url_service_factory.h"

8 #include "chrome/browser/ui/tabs/tab_strip_model.h"	6 #include "chrome/browser/ui/tabs/tab_strip_model.h"

9 #include "chrome/common/url_constants.h"	7 #include "chrome/common/url_constants.h"

10 #include "chrome/test/base/browser_with_test_window_test.h"	8 #include "chrome/test/base/browser_with_test_window_test.h"

11 #include "components/search_engines/search_terms_data.h"	9 #include "components/search_engines/search_terms_data.h"

	10 #include "components/search_engines/template_url_service.h"

	11 #include "components/search_engines/template_url_service_client.h"

12 #include "content/public/browser/navigation_entry.h"	12 #include "content/public/browser/navigation_entry.h"

13 #include "content/public/browser/web_contents.h"	13 #include "content/public/browser/web_contents.h"

14	14

15 typedef BrowserWithTestWindowTest BookmarkTest;	15 typedef BrowserWithTestWindowTest BookmarkTest;

16	16

17 // 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.

18 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) {	18 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) {

19 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));	19 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));

20 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());	20 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());

21 }	21 }

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67	67

68 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest);	68 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest);

69 };	69 };

70	70

71 // 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

72 // the new tab page.	72 // the new tab page.

73 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) {	73 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) {

74 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));	74 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));

75 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());	75 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());

76 }	76 }

OLD	NEW