Remove the Chrome Frame preprocessor define in chrome_constants.cc and deal with resulting fallout.

Also, remove several instances of Chrome Frame using wstrings instead of FilePaths.

The main goal of this patch is to move towards ensuring that Chrome Frame and Google Chrome share binary-identical exes and dlls except for setup.exe and mini_installer.exe.

Review URL: http://codereview.chromium.org/338025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30290 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 27 deletions

diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index fdcb7c7..746a260 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -14,8 +14,6 @@
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/installer/util/google_update_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chrome_frame_resources.h"
 #include "chrome_frame/resource.h"
@@ -548,28 +546,3 @@ bool IsValidUrlScheme(const std::wstring& url, bool is_privileged) {
 
   return false;
 }
-
-// TODO(robertshield): Register and use Chrome's PathProviders.
-// - Note that this function is used by unit tests as well to override
-//   PathService paths, so please test when addressing todo.
-bool GetUserProfileBaseDirectory(std::wstring* path) {
-  DCHECK(path);
-  wchar_t path_buffer[MAX_PATH * 4];
-  path_buffer[0] = 0;
-  // TODO(robertshield): Ideally we should use SHGetFolderLocation and then
-  // get a path via PIDL.
-  HRESULT hr = SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL,
-                               SHGFP_TYPE_CURRENT, path_buffer);
-
-  if (SUCCEEDED(hr)) {
-    *path = path_buffer;
-#if defined(GOOGLE_CHROME_BUILD)
-    file_util::AppendToPath(path, FILE_PATH_LITERAL("Google"));
-#endif
-    file_util::AppendToPath(path, chrome::kBrowserAppName);
-    file_util::AppendToPath(path, chrome::kUserDataDirname);
-    return true;
-  }
-
-  return false;
-}