Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 9d0d9dabddc1bbb7630714fc4ef4848fdfc89dae..ebc1b37a3c21c634283f14b1992386c0dbb82826 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -100,7 +100,6 @@ |
#include "chrome/browser/ui/startup/startup_browser_creator.h" |
#include "chrome/browser/ui/uma_browsing_activity_observer.h" |
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
-#include "chrome/browser/user_data_dir_extractor.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_result_codes.h" |
@@ -785,11 +784,7 @@ int ChromeBrowserMainParts::PreCreateThreads() { |
int ChromeBrowserMainParts::PreCreateThreadsImpl() { |
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreCreateThreadsImpl") |
run_message_loop_ = false; |
- { |
- TRACE_EVENT0("startup", |
- "ChromeBrowserMainParts::PreCreateThreadsImpl:GetUserDataDir"); |
- user_data_dir_ = chrome::GetUserDataDir(parameters()); |
- } |
+ CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_)); |
// Force MediaCaptureDevicesDispatcher to be created on UI thread. |
MediaCaptureDevicesDispatcher::GetInstance(); |