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

Side by Side Diff: chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/memory/scoped_vector.h" 7 #include "base/memory/scoped_vector.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/search_engines/prepopulated_engines.h" 9 #include "chrome/browser/search_engines/prepopulated_engines.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/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/testing_pref_service_syncable.h" 16 #include "chrome/test/base/testing_pref_service_syncable.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 21
22 using base::ASCIIToUTF16;
23
22 namespace { 24 namespace {
23 SearchEngineType GetEngineType(const std::string& url) { 25 SearchEngineType GetEngineType(const std::string& url) {
24 TemplateURLData data; 26 TemplateURLData data;
25 data.SetURL(url); 27 data.SetURL(url);
26 return TemplateURLPrepopulateData::GetEngineType(TemplateURL(NULL, data)); 28 return TemplateURLPrepopulateData::GetEngineType(TemplateURL(NULL, data));
27 } 29 }
28 } // namespace 30 } // namespace
29 31
30 typedef testing::Test TemplateURLPrepopulateDataTest; 32 typedef testing::Test TemplateURLPrepopulateDataTest;
31 33
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 362
361 TEST(TemplateURLPrepopulateDataTest, GetLogoURLInvalid) { 363 TEST(TemplateURLPrepopulateDataTest, GetLogoURLInvalid) {
362 TemplateURLData data; 364 TemplateURLData data;
363 data.SetURL("http://invalid:search:url/"); 365 data.SetURL("http://invalid:search:url/");
364 TemplateURL turl(NULL, data); 366 TemplateURL turl(NULL, data);
365 GURL logo_url = TemplateURLPrepopulateData::GetLogoURL( 367 GURL logo_url = TemplateURLPrepopulateData::GetLogoURL(
366 turl, TemplateURLPrepopulateData::LOGO_100_PERCENT); 368 turl, TemplateURLPrepopulateData::LOGO_100_PERCENT);
367 369
368 EXPECT_TRUE(logo_url.is_empty()); 370 EXPECT_TRUE(logo_url.is_empty());
369 } 371 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_prepopulate_data.cc ('k') | chrome/browser/search_engines/template_url_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698