chrome/test/pyautolib/pyautolib.cc - Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite:

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/test/pyautolib/pyautolib.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixing Created 9 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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/base_paths.h"

5 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

	7 #include "base/path_service.h"

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

7 #include "base/string_util.h"	9 #include "base/string_util.h"

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

9 #include "chrome/test/automation/automation_proxy.h"	11 #include "chrome/test/automation/automation_proxy.h"

10 #include "chrome/test/automation/extension_proxy.h"	12 #include "chrome/test/automation/extension_proxy.h"

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

12 #include "chrome/test/pyautolib/pyautolib.h"	14 #include "chrome/test/pyautolib/pyautolib.h"

13 #include "googleurl/src/gurl.h"	15 #include "googleurl/src/gurl.h"

14	16

15 static int64 StringToId(const std::wstring& str) {	17 static int64 StringToId(const std::wstring& str) {

(...skipping 387 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
403 // TODO(phadjan.jr): figure out a way to unambiguously report error.	405 // TODO(phadjan.jr): figure out a way to unambiguously report error.

404 if (!browser_proxy.get())	406 if (!browser_proxy.get())

405 return cookie_val;	407 return cookie_val;

406 scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);	408 scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);

407 EXPECT_TRUE(tab_proxy.get());	409 EXPECT_TRUE(tab_proxy.get());

408 if (!tab_proxy.get())	410 if (!tab_proxy.get())

409 return cookie_val;	411 return cookie_val;

410 EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));	412 EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));

411 return cookie_val;	413 return cookie_val;

412 }	414 }

OLD	NEW

« chrome/test/base/chrome_test_suite.cc ('K') | « chrome/test/base/testing_browser_process_test.h ('k') | chrome/test/ui/ui_test_suite.cc » ('j') | content/browser/DEPS » ('J')