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

Unified Diff: chrome/test/chromedriver/chrome_launcher.h

Issue 13185004: [chromedriver] Implement proxy capability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/chromedriver/chrome_launcher.h
diff --git a/chrome/test/chromedriver/chrome_launcher.h b/chrome/test/chromedriver/chrome_launcher.h
index cd0d804fb442a0691183a00837d65107ef46767b..dc6dbc24de888f9ba469f937e075aefea89c9d7e 100644
--- a/chrome/test/chromedriver/chrome_launcher.h
+++ b/chrome/test/chromedriver/chrome_launcher.h
@@ -9,6 +9,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
+#include "chrome/test/chromedriver/capabilities_parser.h"
#include "chrome/test/chromedriver/net/sync_websocket_factory.h"
class CommandLine;
@@ -23,22 +24,11 @@ class Chrome;
class Status;
class URLRequestContextGetter;
-Status LaunchDesktopChrome(URLRequestContextGetter* context_getter,
- int port,
- const SyncWebSocketFactory& socket_factory,
- const base::FilePath& exe,
- const base::ListValue* args,
- const base::ListValue* extensions,
- const base::DictionaryValue* prefs,
- const base::DictionaryValue* local_state,
- const std::string& log_path,
- scoped_ptr<Chrome>* chrome);
-
-Status LaunchAndroidChrome(URLRequestContextGetter* context_getter,
- int port,
- const SyncWebSocketFactory& socket_factory,
- const std::string& package_name,
- scoped_ptr<Chrome>* chrome);
+Status LaunchChrome(URLRequestContextGetter* context_getter,
+ int port,
+ const SyncWebSocketFactory& socket_factory,
+ const Capabilities& capabilities,
+ scoped_ptr<Chrome>* chrome);
namespace internal {
Status ProcessCommandLineArgs(const base::ListValue* args,

Powered by Google App Engine
This is Rietveld 408576698