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

chrome_frame/utils.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 <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 #include <wininet.h>
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/registry.h"
-#include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/simple_resource_loader.h"
@@ skipping 378 matching lines @@
         }
       } else {
         NOTREACHED() << "Can't get IE version";
       }
     }
   }
 
   return ie_version;
 }
 
-FilePath GetIETemporaryFilesFolder() {
-  DCHECK_EQ(BROWSER_IE, GetBrowserType());
-
-  LPITEMIDLIST tif_pidl = NULL;
-  HRESULT hr = SHGetFolderLocation(NULL, CSIDL_INTERNET_CACHE, NULL,
-                                   SHGFP_TYPE_CURRENT, &tif_pidl);
-  DCHECK(SUCCEEDED(hr) && tif_pidl);
-
-  ScopedComPtr<IShellFolder> parent_folder;
-  LPCITEMIDLIST relative_pidl = NULL;
-  hr = SHBindToParent(tif_pidl, IID_IShellFolder,
-                      reinterpret_cast<void**>(parent_folder.Receive()),
-                      &relative_pidl);
-  DCHECK(SUCCEEDED(hr) && relative_pidl);
-
-  STRRET path = {0};
-  hr = parent_folder->GetDisplayNameOf(relative_pidl,
-                                       SHGDN_NORMAL | SHGDN_FORPARSING,
-                                       &path);
-  DCHECK(SUCCEEDED(hr));
-  ScopedBstr tif_bstr;
-  StrRetToBSTR(&path, relative_pidl, tif_bstr.Receive());
-  FilePath tif(static_cast<BSTR>(tif_bstr));
-
-  ILFree(tif_pidl);
-  return tif;
-}
-
 bool IsIEInPrivate() {
   typedef BOOL (WINAPI* IEIsInPrivateBrowsingPtr)();
   bool incognito_mode = false;
   HMODULE h = GetModuleHandle(L"ieframe.dll");
   if (h) {
     IEIsInPrivateBrowsingPtr IsInPrivate =
         reinterpret_cast<IEIsInPrivateBrowsingPtr>(GetProcAddress(h,
         "IEIsInPrivateBrowsing"));
     if (IsInPrivate) {
       incognito_mode = !!IsInPrivate();
@@ skipping 489 matching lines @@
     case COOKIE_STATE_REJECT:
       cookie_action = COOKIEACTION_REJECT;
       break;
     default:
       cookie_action = COOKIEACTION_REJECT;
       break;
   }
   return cookie_action;
 }