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 "chrome_frame/test/net/test_automation_provider.h" | 5 #include "chrome_frame/test/net/test_automation_provider.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_version_info.h" | 8 #include "base/file_version_info.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "chrome/common/automation_messages.h" | 10 #include "chrome/common/automation_messages.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 version = WideToASCII(version_info->product_version()); | 112 version = WideToASCII(version_info->product_version()); |
113 } | 113 } |
114 return version; | 114 return version; |
115 } | 115 } |
116 | 116 |
117 // static | 117 // static |
118 TestAutomationProvider* TestAutomationProvider::NewAutomationProvider( | 118 TestAutomationProvider* TestAutomationProvider::NewAutomationProvider( |
119 Profile* p, const std::string& channel, | 119 Profile* p, const std::string& channel, |
120 TestAutomationProviderDelegate* delegate) { | 120 TestAutomationProviderDelegate* delegate) { |
121 TestAutomationProvider* automation = new TestAutomationProvider(p, delegate); | 121 TestAutomationProvider* automation = new TestAutomationProvider(p, delegate); |
122 automation->ConnectToChannel(channel); | 122 automation->InitializeChannel(channel); |
123 automation->SetExpectedTabCount(1); | 123 automation->SetExpectedTabCount(1); |
124 return automation; | 124 return automation; |
125 } | 125 } |
OLD | NEW |