summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/test/net')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc15
-rw-r--r--chrome_frame/test/net/fake_external_tab.h3
2 files changed, 2 insertions, 16 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 8db3b48..497ae88 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -12,6 +12,7 @@
#include "base/command_line.h"
#include "base/file_util.h"
+#include "base/file_version_info.h"
#include "base/i18n/icu_util.h"
#include "base/path_service.h"
#include "base/scoped_bstr_win.h"
@@ -164,10 +165,9 @@ BOOL SupplyProxyCredentials::EnumChildren(HWND hwnd, LPARAM param) {
return TRUE;
}
-
FakeExternalTab::FakeExternalTab() {
+ user_data_dir_ = chrome_frame_test::GetProfilePathForIE();
PathService::Get(chrome::DIR_USER_DATA, &overridden_user_dir_);
- GetProfilePath(&user_data_dir_);
PathService::Override(chrome::DIR_USER_DATA, user_data_dir_);
process_singleton_.reset(new ProcessSingleton(user_data_dir_));
}
@@ -178,17 +178,6 @@ FakeExternalTab::~FakeExternalTab() {
}
}
-std::wstring FakeExternalTab::GetProfileName() {
- return L"iexplore";
-}
-
-bool FakeExternalTab::GetProfilePath(FilePath* path) {
- if (!chrome::GetChromeFrameUserDataDirectory(path))
- return false;
- *path = path->Append(GetProfileName());
- return true;
-}
-
void FakeExternalTab::Initialize() {
DCHECK(g_browser_process == NULL);
SystemMonitor system_monitor;
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index dd35756..5238277 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -26,9 +26,6 @@ class FakeExternalTab {
FakeExternalTab();
virtual ~FakeExternalTab();
- virtual std::wstring GetProfileName();
-
- virtual bool GetProfilePath(FilePath* path);
virtual void Initialize();
virtual void Shutdown();