chrome/browser/sessions/session_restore_uitest.cc - Issue 4710001: Split out command IDs from chrome_dll_resource.h.

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/session_restore_uitest.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

« chrome/app/chrome_dll_resource.h ('K') | « chrome/browser/repost_form_warning_uitest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | chrome/chrome_exe.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/file_path.h"	6 #include "base/file_path.h"

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

8 #include "base/string_number_conversions.h"	8 #include "base/string_number_conversions.h"

9 #include "chrome/app/chrome_dll_resource.h"	9 #include "chrome/app/chrome_command_ids.h"

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

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

12 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

13 #include "chrome/test/automation/tab_proxy.h"	13 #include "chrome/test/automation/tab_proxy.h"

14 #include "chrome/test/automation/browser_proxy.h"	14 #include "chrome/test/automation/browser_proxy.h"

15 #include "chrome/test/automation/window_proxy.h"	15 #include "chrome/test/automation/window_proxy.h"

16 #include "chrome/test/ui/ui_test.h"	16 #include "chrome/test/ui/ui_test.h"

17 #include "googleurl/src/gurl.h"	17 #include "googleurl/src/gurl.h"

18 #include "net/base/net_util.h"	18 #include "net/base/net_util.h"

19 #include "net/test/test_server.h"	19 #include "net/test/test_server.h"

(...skipping 459 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
479 ASSERT_TRUE(tab_proxy.get() != NULL);	479 ASSERT_TRUE(tab_proxy.get() != NULL);

480 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));	480 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));

481 tab_proxy = browser_proxy->GetTab(tab_count - 1);	481 tab_proxy = browser_proxy->GetTab(tab_count - 1);

482 ASSERT_TRUE(tab_proxy.get() != NULL);	482 ASSERT_TRUE(tab_proxy.get() != NULL);

483 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));	483 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms()));

484	484

485 ASSERT_EQ(expected_process_count, GetBrowserProcessCount());	485 ASSERT_EQ(expected_process_count, GetBrowserProcessCount());

486 }	486 }

487	487

488 } // namespace	488 } // namespace

OLD	NEW