chrome/browser/search_engines/template_url_service_sync_unittest.cc - Issue 15906011: Use a direct include of strings headers in chrome/browser/r*-s*/.

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_engines/template_url_service_sync_unittest.cc

Issue 15906011: Use a direct include of strings headers in chrome/browser/r*-s*/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/search_engines/template_url_service_android.cc ('k') | chrome/browser/search_engines/template_url_service_test_util.h » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "base/memory/scoped_vector.h"	6 #include "base/memory/scoped_vector.h"

7 #include "base/string_util.h"	7 #include "base/strings/string_util.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "base/time.h"	9 #include "base/time.h"

10 #include "chrome/browser/search_engines/search_terms_data.h"	10 #include "chrome/browser/search_engines/search_terms_data.h"

11 #include "chrome/browser/search_engines/template_url.h"	11 #include "chrome/browser/search_engines/template_url.h"

12 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"	12 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"

13 #include "chrome/browser/search_engines/template_url_service.h"	13 #include "chrome/browser/search_engines/template_url_service.h"

14 #include "chrome/browser/search_engines/template_url_service_factory.h"	14 #include "chrome/browser/search_engines/template_url_service_factory.h"

15 #include "chrome/browser/search_engines/template_url_service_test_util.h"	15 #include "chrome/browser/search_engines/template_url_service_test_util.h"

16 #include "chrome/common/chrome_notification_types.h"	16 #include "chrome/common/chrome_notification_types.h"

17 #include "chrome/common/pref_names.h"	17 #include "chrome/common/pref_names.h"

(...skipping 2243 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2261 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing(	2261 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing(

2262 syncer::SEARCH_ENGINES, list, PassProcessor(),	2262 syncer::SEARCH_ENGINES, list, PassProcessor(),

2263 CreateAndPassSyncErrorFactory());	2263 CreateAndPassSyncErrorFactory());

2264	2264

2265 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default");	2265 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default");

2266 EXPECT_TRUE(result_turl);	2266 EXPECT_TRUE(result_turl);

2267 EXPECT_EQ(default_turl->keyword(), result_turl->keyword());	2267 EXPECT_EQ(default_turl->keyword(), result_turl->keyword());

2268 EXPECT_EQ(default_turl->short_name(), result_turl->short_name());	2268 EXPECT_EQ(default_turl->short_name(), result_turl->short_name());

2269 EXPECT_EQ(default_turl->url(), result_turl->url());	2269 EXPECT_EQ(default_turl->url(), result_turl->url());

2270 }	2270 }

OLD	NEW