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

Side by Side Diff: chrome/browser/sync/test/integration/search_engines_helper.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
OLDNEW
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 "chrome/browser/sync/test/integration/search_engines_helper.h" 5 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "base/strings/utf_string_conversions.h"
11 #include "base/time.h" 12 #include "base/time.h"
12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/search_engines/template_url.h" 14 #include "chrome/browser/search_engines/template_url.h"
15 #include "chrome/browser/search_engines/template_url_service.h" 15 #include "chrome/browser/search_engines/template_url_service.h"
16 #include "chrome/browser/search_engines/template_url_service_factory.h" 16 #include "chrome/browser/search_engines/template_url_service_factory.h"
17 #include "chrome/browser/sync/profile_sync_service_harness.h" 17 #include "chrome/browser/sync/profile_sync_service_harness.h"
18 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 18 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
19 #include "chrome/browser/sync/test/integration/sync_test.h" 19 #include "chrome/browser/sync/test/integration/sync_test.h"
20 20
21 using sync_datatype_helper::test; 21 using sync_datatype_helper::test;
22 22
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 service->SetDefaultSearchProvider(turl); 258 service->SetDefaultSearchProvider(turl);
259 if (test()->use_verifier()) { 259 if (test()->use_verifier()) {
260 TemplateURL* verifier_turl = 260 TemplateURL* verifier_turl =
261 GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed)); 261 GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed));
262 ASSERT_TRUE(verifier_turl); 262 ASSERT_TRUE(verifier_turl);
263 GetVerifierService()->SetDefaultSearchProvider(verifier_turl); 263 GetVerifierService()->SetDefaultSearchProvider(verifier_turl);
264 } 264 }
265 } 265 }
266 266
267 } // namespace search_engines_helper 267 } // namespace search_engines_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698