Reverting this CL to see if this fixes chrome frame unit test failures....

chrome_frame/test/chrome_frame_test_utils.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/registry.h"   // to find IE and firefox
 #include "base/scoped_handle.h"
 #include "base/scoped_comptr_win.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/utils.h"
-
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_frame_test {
 
 const int kDefaultWaitForIEToTerminateMs = 10 * 1000;
 
 const wchar_t kIEImageName[] = L"iexplore.exe";
 const wchar_t kIEBrokerImageName[] = L"ieuser.exe";
 const wchar_t kFirefoxImageName[] = L"firefox.exe";
 const wchar_t kOperaImageName[] = L"opera.exe";
@@ skipping 322 matching lines @@
     cocreate_flags |= CLSCTX_ENABLE_CLOAKING;
   }
 
   hr = ::CoCreateInstance(CLSID_InternetExplorer, NULL,
                           cocreate_flags, IID_IWebBrowser2,
                           reinterpret_cast<void**>(web_browser));
   // ~LowIntegrityToken() will switch integrity back to medium.
   return hr;
 }
 
-FilePath GetProfilePath(const std::wstring& profile_name) {
-  FilePath profile_path;
-  chrome::GetChromeFrameUserDataDirectory(&profile_path);
-  return profile_path.Append(profile_name);
-}
-
 _ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = {
   CC_STDCALL, VT_EMPTY, 5, {
     VT_DISPATCH,
     VT_VARIANT | VT_BYREF,
     VT_VARIANT | VT_BYREF,
     VT_VARIANT | VT_BYREF,
     VT_BOOL | VT_BYREF,
   }
 };
 
@@ skipping 379 matching lines @@
 void WebBrowserEventSink::WatchChromeWindow(const wchar_t* window_class) {
   DCHECK(window_class);
   window_watcher_.AddObserver(this, WideToUTF8(window_class));
 }
 
 void WebBrowserEventSink::StopWatching() {
   window_watcher_.RemoveObserver(this);
 }
 
 }  // namespace chrome_frame_test