chrome/browser/search_engines/template_url_parser_unittest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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_parser_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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_fetcher_unittest.cc ('k') | chrome/browser/sessions/better_session_restore_browsertest.cc » ('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/file_util.h"	5 #include "base/files/file_util.h"

6 #include "base/logging.h"	6 #include "base/logging.h"

7 #include "base/path_service.h"	7 #include "base/path_service.h"

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

9 #include "chrome/common/chrome_paths.h"	9 #include "chrome/common/chrome_paths.h"

10 #include "components/search_engines/search_terms_data.h"	10 #include "components/search_engines/search_terms_data.h"

11 #include "components/search_engines/template_url.h"	11 #include "components/search_engines/template_url.h"

12 #include "components/search_engines/template_url_parser.h"	12 #include "components/search_engines/template_url_parser.h"

13 #include "testing/gtest/include/gtest/gtest.h"	13 #include "testing/gtest/include/gtest/gtest.h"

14	14

15 using base::ASCIIToUTF16;	15 using base::ASCIIToUTF16;

(...skipping 238 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
254 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name());	254 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name());

255 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement(SearchTermsData()));	255 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement(SearchTermsData()));

256 EXPECT_TRUE(template_url_->suggestions_url().empty());	256 EXPECT_TRUE(template_url_->suggestions_url().empty());

257 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",	257 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",

258 template_url_->url());	258 template_url_->url());

259 ASSERT_EQ(1U, template_url_->input_encodings().size());	259 ASSERT_EQ(1U, template_url_->input_encodings().size());

260 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]);	260 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]);

261 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),	261 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),

262 template_url_->favicon_url());	262 template_url_->favicon_url());

263 }	263 }

OLD	NEW