| Index: chrome/browser/net/chrome_url_request_context.cc
|
| diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
|
| index 2603b29609cae1086746ff7b9baf717916e47f3c..5ba3f6338cfab9ecfa189724bbccf461eca87f85 100644
|
| --- a/chrome/browser/net/chrome_url_request_context.cc
|
| +++ b/chrome/browser/net/chrome_url_request_context.cc
|
| @@ -9,7 +9,7 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chrome_thread.h"
|
| #include "chrome/browser/extensions/extensions_service.h"
|
| -#include "chrome/browser/greasemonkey_master.h"
|
| +#include "chrome/browser/extensions/user_script_master.h"
|
| #include "chrome/browser/profile.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -112,7 +112,7 @@ ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile)
|
| extension_paths_[(*iter)->id()] = (*iter)->path();
|
| }
|
|
|
| - user_script_dir_path_ = profile->GetGreasemonkeyMaster()->user_script_dir();
|
| + user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir();
|
|
|
| prefs_->AddPrefObserver(prefs::kAcceptLanguages, this);
|
| prefs_->AddPrefObserver(prefs::kCookieBehavior, this);
|
|
|