chrome/browser/extensions/api/i18n/i18n_apitest.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/extensions/api/i18n/i18n_apitest.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/extensions/api/file_system/file_system_apitest.cc ('k') | chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.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"

6 #include "base/files/file_path.h"	5 #include "base/files/file_path.h"

	6 #include "base/files/file_util.h"

7 #include "base/files/scoped_temp_dir.h"	7 #include "base/files/scoped_temp_dir.h"

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

9 #include "chrome/browser/extensions/extension_apitest.h"	9 #include "chrome/browser/extensions/extension_apitest.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/test/base/ui_test_utils.h"	11 #include "chrome/test/base/ui_test_utils.h"

12 #include "extensions/common/extension.h"	12 #include "extensions/common/extension.h"

13 #include "net/test/embedded_test_server/embedded_test_server.h"	13 #include "net/test/embedded_test_server/embedded_test_server.h"

14	14

15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) {	15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) {

16 ASSERT_TRUE(StartEmbeddedTestServer());	16 ASSERT_TRUE(StartEmbeddedTestServer());

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59	59

60 // Check that the i18n message is also changed.	60 // Check that the i18n message is also changed.

61 ui_test_utils::NavigateToURL(	61 ui_test_utils::NavigateToURL(

62 browser(),	62 browser(),

63 embedded_test_server()->GetURL("/extensions/test_file.html"));	63 embedded_test_server()->GetURL("/extensions/test_file.html"));

64 EXPECT_TRUE(catcher.GetNextResult());	64 EXPECT_TRUE(catcher.GetNextResult());

65	65

66 ui_test_utils::GetCurrentTabTitle(browser(), &title);	66 ui_test_utils::GetCurrentTabTitle(browser(), &title);

67 EXPECT_EQ(std::string("SECONDMESSAGE"), base::UTF16ToUTF8(title));	67 EXPECT_EQ(std::string("SECONDMESSAGE"), base::UTF16ToUTF8(title));

68 }	68 }

OLD	NEW