Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome_frame/test/perf/chrome_frame_perftest.cc

 // Copyright (c) 2006-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/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
 
 #include "chrome_tab.h"  // Generated from chrome_tab.idl.
 
 #include "base/file_util.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/perf/mem_usage.h"
 #include "chrome/test/ui/ui_test.h"
 
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSilverlightControlKey[] =
     L"CLSID\\{DFEAF541-F3E1-4c24-ACAC-99C30715084A}\\InprocServer32";
 
@@ skipping 598 matching lines @@
     }
 
     EXPECT_TRUE(
         file_util::PathExists(FilePath::FromWStringHack(chrome_exe_test_path)));
 
     return chrome_exe_path;
   }
 
   void InitiateNextNavigation() {
     if (browser_pid_ == 0) {
-      std::wstring profile_directory;
-      if (GetUserProfileBaseDirectory(&profile_directory)) {
-        file_util::AppendToPath(&profile_directory,
-                                GetHostProcessName(false));
+      FilePath profile_directory;
+      if (chrome::GetChromeFrameUserDataDirectory(&user_data_dir_)) {
+        user_data_dir_ = user_data_dir_.Append(GetHostProcessName(false));
       }
 
-      user_data_dir_ = FilePath::FromWStringHack(profile_directory);
       browser_pid_ = ChromeBrowserProcessId(user_data_dir_);
     }
 
     EXPECT_TRUE(static_cast<int>(browser_pid_) > 0);
 
     // Get the memory consumption information for the child processes
     // of the chrome browser.
     ChromeProcessList child_processes = GetBrowserChildren();
     ChromeProcessList::iterator index;
     for (index = child_processes.begin(); index != child_processes.end();
@@ skipping 472 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }