chrome/browser/sessions/tab_restore_browsertest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/sessions/tab_restore_browsertest.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

« no previous file with comments | « chrome/browser/sessions/session_types_unittest.cc ('k') | chrome/browser/shell_integration.cc » ('j') | no next file with comments »

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/basictypes.h"	5 #include "base/basictypes.h"

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

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

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

8 #include "base/test/test_timeouts.h"	9 #include "base/test/test_timeouts.h"

9 #include "base/utf_string_conversions.h"

10 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

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

12 #include "chrome/browser/ui/browser_commands.h"	12 #include "chrome/browser/ui/browser_commands.h"

13 #include "chrome/browser/ui/browser_list.h"	13 #include "chrome/browser/ui/browser_list.h"

14 #include "chrome/browser/ui/browser_tabstrip.h"	14 #include "chrome/browser/ui/browser_tabstrip.h"

15 #include "chrome/browser/ui/find_bar/find_notification_details.h"	15 #include "chrome/browser/ui/find_bar/find_notification_details.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

17 #include "chrome/common/chrome_notification_types.h"	17 #include "chrome/common/chrome_notification_types.h"

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

19 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

(...skipping 546 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
566 EnsureTabFinishedRestoring(tab);	566 EnsureTabFinishedRestoring(tab);

567 ASSERT_EQ(http_url, tab->GetURL());	567 ASSERT_EQ(http_url, tab->GetURL());

568	568

569 // Go back, and see if content is as expected.	569 // Go back, and see if content is as expected.

570 GoBack(browser());	570 GoBack(browser());

571 EXPECT_GT(	571 EXPECT_GT(

572 ui_test_utils::FindInPage(tab, ASCIIToUTF16("webkit"), true, false, NULL,	572 ui_test_utils::FindInPage(tab, ASCIIToUTF16("webkit"), true, false, NULL,

573 NULL),	573 NULL),

574 0);	574 0);

575 }	575 }

OLD	NEW