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

Side by Side Diff: chrome/browser/search/instant_unittest_base.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
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 #include "chrome/browser/search/instant_unittest_base.h" 5 #include "chrome/browser/search/instant_unittest_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h"
10 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/search/instant_service.h" 13 #include "chrome/browser/search/instant_service.h"
13 #include "chrome/browser/search/instant_service_factory.h" 14 #include "chrome/browser/search/instant_service_factory.h"
14 #include "chrome/browser/search/search.h" 15 #include "chrome/browser/search/search.h"
15 #include "chrome/browser/search_engines/template_url_service_factory.h" 16 #include "chrome/browser/search_engines/template_url_service_factory.h"
16 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 17 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
17 #include "chrome/test/base/browser_with_test_window_test.h" 18 #include "chrome/test/base/browser_with_test_window_test.h"
18 #include "chrome/test/base/search_test_utils.h" 19 #include "chrome/test/base/search_test_utils.h"
19 #include "components/google/core/browser/google_pref_names.h" 20 #include "components/google/core/browser/google_pref_names.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void InstantUnitTestBase::SetUpHelper() { 93 void InstantUnitTestBase::SetUpHelper() {
93 BrowserWithTestWindowTest::SetUp(); 94 BrowserWithTestWindowTest::SetUp();
94 95
95 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); 96 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile());
96 search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); 97 search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_);
97 98
98 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); 99 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/");
99 SetUserSelectedDefaultSearchProvider("{google:baseURL}"); 100 SetUserSelectedDefaultSearchProvider("{google:baseURL}");
100 instant_service_ = InstantServiceFactory::GetForProfile(profile()); 101 instant_service_ = InstantServiceFactory::GetForProfile(profile());
101 } 102 }
OLDNEW
« no previous file with comments | « chrome/browser/search/instant_unittest_base.h ('k') | chrome/browser/search/local_files_ntp_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698