Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome_frame/test/net/fake_external_tab.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test/net/fake_external_tab.h"
 
 #include <exdisp.h>
 
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profile_manager.h"
+#include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/browser/renderer_host/render_process_host.h"
 
 #include "chrome_frame/utils.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/net/dialog_watchdog.h"
 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
 
 namespace {
 
 // A special command line switch to allow developers to manually launch the
 // browser and debug CF inside the browser.
@@ skipping 22 matching lines @@
 }
 
 bool PromptAfterSetup() {
   return CommandLine::ForCurrentProcess()->HasSwitch(kPromptAfterSetup);
 }
 
 }  // end namespace
 
 FakeExternalTab::FakeExternalTab() {
   PathService::Get(chrome::DIR_USER_DATA, &overridden_user_dir_);
-  user_data_dir_ = FilePath::FromWStringHack(GetProfilePath());
+  GetProfilePath(&user_data_dir_);
   PathService::Override(chrome::DIR_USER_DATA, user_data_dir_);
   process_singleton_.reset(new ProcessSingleton(user_data_dir_));
 }
 
 FakeExternalTab::~FakeExternalTab() {
   if (!overridden_user_dir_.empty()) {
     PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_);
   }
 }
 
 std::wstring FakeExternalTab::GetProfileName() {
   return L"iexplore";
 }
 
-std::wstring FakeExternalTab::GetProfilePath() {
-  std::wstring path;
-  GetUserProfileBaseDirectory(&path);
-  file_util::AppendToPath(&path, GetProfileName());
-  return path;
+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);
 
   // The gears plugin causes the PluginRequestInterceptor to kick in and it
   // will cause problems when it tries to intercept URL requests.
   PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath());
 
   icu_util::Initialize();
@@ skipping 280 matching lines @@
   DialogWatchdog watchdog;
   // See url_request_unittest.cc for these credentials.
   SupplyProxyCredentials credentials("user", "secret");
   watchdog.AddObserver(&credentials);
   testing::InitGoogleTest(&argc, argv);
   FilterDisabledTests();
   CFUrlRequestUnittestRunner test_suite(argc, argv);
   test_suite.RunMainUIThread();
   return 0;
 }