| 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/scoped_ptr.h" | 5 #include "base/scoped_ptr.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/test/automation/tab_proxy.h" | 8 #include "chrome/test/automation/tab_proxy.h" |
| 9 #include "chrome/test/pyautolib/pyautolib.h" | 9 #include "chrome/test/pyautolib/pyautolib.h" |
| 10 #include "googleurl/src/gurl.h" | 10 #include "googleurl/src/gurl.h" |
| 11 | 11 |
| 12 PyUITestSuite::PyUITestSuite(int argc, char** argv) | 12 PyUITestSuite::PyUITestSuite( |
| 13 int argc, char** argv, bool clear_profile, std::wstring homepage) |
| 13 : UITestSuite(argc, argv), | 14 : UITestSuite(argc, argv), |
| 14 UITestBase() { | 15 UITestBase() { |
| 16 set_clear_profile(clear_profile); |
| 17 set_homepage(homepage); |
| 15 } | 18 } |
| 16 | 19 |
| 17 PyUITestSuite::~PyUITestSuite() { | 20 PyUITestSuite::~PyUITestSuite() { |
| 18 UITestSuite::Shutdown(); | 21 UITestSuite::Shutdown(); |
| 19 } | 22 } |
| 20 | 23 |
| 21 void PyUITestSuite::Initialize(const FilePath& browser_dir) { | 24 void PyUITestSuite::Initialize(const FilePath& browser_dir) { |
| 22 UITestSuite::SetBrowserDirectory(browser_dir); | 25 UITestSuite::SetBrowserDirectory(browser_dir); |
| 23 UITestBase::SetBrowserDirectory(browser_dir); | 26 UITestBase::SetBrowserDirectory(browser_dir); |
| 24 UITestSuite::Initialize(); | 27 UITestSuite::Initialize(); |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 scoped_refptr<BrowserProxy> browser_proxy = | 240 scoped_refptr<BrowserProxy> browser_proxy = |
| 238 automation()->GetBrowserWindow(0); // Window doesn't matter. | 241 automation()->GetBrowserWindow(0); // Window doesn't matter. |
| 239 EXPECT_TRUE(browser_proxy.get()); | 242 EXPECT_TRUE(browser_proxy.get()); |
| 240 if (!browser_proxy.get()) | 243 if (!browser_proxy.get()) |
| 241 return false; | 244 return false; |
| 242 | 245 |
| 243 return browser_proxy->RemoveBookmark(StringToInt64(WideToUTF16(id))); | 246 return browser_proxy->RemoveBookmark(StringToInt64(WideToUTF16(id))); |
| 244 } | 247 } |
| 245 | 248 |
| 246 | 249 |
| OLD | NEW |