Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome_frame/chrome_frame_automation.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/chrome_frame_automation.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/app/client_util.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/test/automation/tab_proxy.h"
 #include "chrome_frame/chrome_launcher.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/sync_msg_reply_dispatcher.h"
 
 #ifdef NDEBUG
 int64 kAutomationServerReasonableLaunchDelay = 1000;  // in milliseconds
 #else
 int64 kAutomationServerReasonableLaunchDelay = 1000 * 10;
@@ skipping 214 matching lines @@
 
   // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very
   // useful for Chrome Frame users.
   command_line->AppendSwitch(switches::kNoErrorDialogs);
 
   command_line->AppendSwitch(switches::kEnableRendererAccessibility);
 
   // Place the profile directory in
   // "<chrome_exe_path>\..\User Data\<profile-name>"
   if (!entry->profile_name.empty()) {
-    std::wstring profile_path;
-    if (GetUserProfileBaseDirectory(&profile_path)) {
-      file_util::AppendToPath(&profile_path, entry->profile_name);
+    FilePath profile_path;
+    if (chrome::GetChromeFrameUserDataDirectory(&profile_path)) {
+      profile_path = profile_path.Append(entry->profile_name);
       command_line->AppendSwitchWithValue(switches::kUserDataDir,
-          profile_path);
+          profile_path.value());
     } else {
       // Can't get the profile dir :-( We need one to work, so fail.
       // We have no code for launch failure.
       entry->launch_result = AutomationLaunchResult(-1);
     }
   }
 
   std::wstring command_line_string(command_line->command_line_string());
   // If there are any extra arguments, append them to the command line.
   if (!extra_chrome_arguments.empty()) {
@@ skipping 827 matching lines @@
   if (font_size < SMALLEST_FONT ||
       font_size > LARGEST_FONT) {
       NOTREACHED() << "Invalid font size specified : "
                    << font_size;
       return;
   }
 
   Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size));
 }