diff options
| author | Steve Block <steveblock@google.com> | 2010-08-04 11:41:34 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-09 12:04:44 +0100 |
| commit | db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 (patch) | |
| tree | 9f793c5b0f5e1f2aca8247158920e2c4bf962bbf /WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp | |
| parent | bf916837aa84f1e4b00e6ed6268516c2acd27545 (diff) | |
| download | external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.zip external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.gz external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.bz2 | |
Merge WebKit at r64523 : Initial merge by git.
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
Diffstat (limited to 'WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp')
| -rw-r--r-- | WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp index 987481a..9bec373 100644 --- a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp +++ b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp @@ -50,11 +50,11 @@ void TestController::initializeInjectedBundlePath() m_injectedBundlePath.adopt(WKStringCreateWithCFString(bundlePath)); } -void TestController::initializeTestPluginPath() +void TestController::initializeTestPluginDirectory() { CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle); CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath); - m_testPluginPath.adopt(WKStringCreateWithCFString(bundlePath)); + m_testPluginDirectory.adopt(WKStringCreateWithCFString(bundlePath)); } } // namespace WTR |