| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_utils.h" | 5 #include "chrome_frame/test_utils.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlwin.h> | 8 #include <atlwin.h> |
| 9 | 9 |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 new_chrome_frame_dll_path_ = path; | 73 new_chrome_frame_dll_path_ = path; |
| 74 } | 74 } |
| 75 | 75 |
| 76 void ScopedChromeFrameRegistrar::RegisterReferenceChromeFrameBuild() { | 76 void ScopedChromeFrameRegistrar::RegisterReferenceChromeFrameBuild() { |
| 77 std::wstring reference_build_dir; | 77 std::wstring reference_build_dir; |
| 78 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &reference_build_dir)); | 78 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &reference_build_dir)); |
| 79 | 79 |
| 80 file_util::UpOneDirectory(&reference_build_dir); | 80 file_util::UpOneDirectory(&reference_build_dir); |
| 81 file_util::UpOneDirectory(&reference_build_dir); | 81 file_util::UpOneDirectory(&reference_build_dir); |
| 82 | 82 |
| 83 file_util::AppendToPath(&reference_build_dir, L"chrome_frame"); | 83 file_util::AppendToPath(&reference_build_dir, L"chrome"); |
| 84 file_util::AppendToPath(&reference_build_dir, L"tools"); | 84 file_util::AppendToPath(&reference_build_dir, L"tools"); |
| 85 file_util::AppendToPath(&reference_build_dir, L"test"); | 85 file_util::AppendToPath(&reference_build_dir, L"test"); |
| 86 file_util::AppendToPath(&reference_build_dir, L"reference_build"); | 86 file_util::AppendToPath(&reference_build_dir, L"reference_build"); |
| 87 file_util::AppendToPath(&reference_build_dir, L"chrome"); | 87 file_util::AppendToPath(&reference_build_dir, L"chrome_frame"); |
| 88 file_util::AppendToPath(&reference_build_dir, L"servers"); | 88 file_util::AppendToPath(&reference_build_dir, L"servers"); |
| 89 file_util::AppendToPath(&reference_build_dir, L"npchrome_tab.dll"); | 89 file_util::AppendToPath(&reference_build_dir, L"npchrome_tab.dll"); |
| 90 | 90 |
| 91 RegisterChromeFrameAtPath(reference_build_dir); | 91 RegisterChromeFrameAtPath(reference_build_dir); |
| 92 } | 92 } |
| 93 | 93 |
| 94 std::wstring ScopedChromeFrameRegistrar::GetChromeFrameDllPath() const { | 94 std::wstring ScopedChromeFrameRegistrar::GetChromeFrameDllPath() const { |
| 95 return new_chrome_frame_dll_path_; | 95 return new_chrome_frame_dll_path_; |
| 96 } | 96 } |
| OLD | NEW |