chrome/browser/search/instant_unittest_base.h - Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

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/search/instant_unittest_base.h

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the KeywordEditorControllerTest. Created 6 years, 7 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

« chrome/browser/search/instant_service.h ('K') | « chrome/browser/search/instant_service.cc ('k') | chrome/browser/search/instant_unittest_base.cc » ('j') | chrome/browser/search_engines/default_search_manager.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_	5 #ifndef CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_

6 #define CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_	6 #define CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/metrics/field_trial.h"	10 #include "base/metrics/field_trial.h"

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 // tests, so this is required.	42 // tests, so this is required.

43 void NotifyGoogleBaseURLUpdate(const std::string& new_google_base_url);	43 void NotifyGoogleBaseURLUpdate(const std::string& new_google_base_url);

44	44

45 bool IsInstantServiceObserver(InstantServiceObserver* observer);	45 bool IsInstantServiceObserver(InstantServiceObserver* observer);

46	46

47 InstantService* instant_service_;	47 InstantService* instant_service_;

48 TemplateURLService* template_url_service_;	48 TemplateURLService* template_url_service_;

49 scoped_ptr<base::FieldTrialList> field_trial_list_;	49 scoped_ptr<base::FieldTrialList> field_trial_list_;

50	50

51 private:	51 private:

	52 // BrowserWithTestWindowTest override
	Peter Kasting 2014/05/03 00:28:18 Nit: " override" -> ":" Nit: " override" -> ":" erikwright (departed) 2014/05/05 01:49:38 Done. Show quoted text On 2014/05/03 00:28:18, Peter Kasting wrote: > Nit: " override" -> ":" Done.
	53 virtual void CustomizeServiceFactories() OVERRIDE;

	54

52 void SetUpHelper();	55 void SetUpHelper();

53 };	56 };

54	57

55 #endif // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_	58 #endif // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_

OLD	NEW