Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: chrome/test/pyautolib/pyautolib.cc

Issue 7523060: Let pyauto create an attached webdriver instance to manipulate web pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years, 4 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
OLDNEW
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/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/string_number_conversions.h" 6 #include "base/string_number_conversions.h"
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/test/automation/automation_proxy.h" 9 #include "chrome/test/automation/automation_proxy.h"
10 #include "chrome/test/automation/extension_proxy.h" 10 #include "chrome/test/automation/extension_proxy.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 return message_loop_; 62 return message_loop_;
63 } 63 }
64 64
65 void PyUITestBase::Initialize(const FilePath& browser_dir) { 65 void PyUITestBase::Initialize(const FilePath& browser_dir) {
66 UITestBase::SetBrowserDirectory(browser_dir); 66 UITestBase::SetBrowserDirectory(browser_dir);
67 } 67 }
68 68
69 ProxyLauncher* PyUITestBase::CreateProxyLauncher() { 69 ProxyLauncher* PyUITestBase::CreateProxyLauncher() {
70 if (named_channel_id_.empty()) 70 if (named_channel_id_.empty())
71 return new AnonymousProxyLauncher(false); 71 return new AnonymousProxyLauncher(false);
72 return new NamedProxyLauncher(named_channel_id_, false, false); 72 return new NamedProxyLauncher(named_channel_id_, false, true, false);
73 } 73 }
74 74
75 void PyUITestBase::SetUp() { 75 void PyUITestBase::SetUp() {
76 UITestBase::SetUp(); 76 UITestBase::SetUp();
77 } 77 }
78 78
79 void PyUITestBase::TearDown() { 79 void PyUITestBase::TearDown() {
80 UITestBase::TearDown(); 80 UITestBase::TearDown();
81 } 81 }
82 82
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // TODO(phadjan.jr): figure out a way to unambiguously report error. 398 // TODO(phadjan.jr): figure out a way to unambiguously report error.
399 if (!browser_proxy.get()) 399 if (!browser_proxy.get())
400 return cookie_val; 400 return cookie_val;
401 scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index); 401 scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
402 EXPECT_TRUE(tab_proxy.get()); 402 EXPECT_TRUE(tab_proxy.get());
403 if (!tab_proxy.get()) 403 if (!tab_proxy.get())
404 return cookie_val; 404 return cookie_val;
405 EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val)); 405 EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));
406 return cookie_val; 406 return cookie_val;
407 } 407 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698