Index: chrome/browser/extensions/extension_preference_api.cc |
diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc |
index 585850cb59b39115f4afb68474966e1ff112b5d6..5ace8cfcf76d003806b4f5a20e9acc6ad9a5b953 100644 |
--- a/chrome/browser/extensions/extension_preference_api.cc |
+++ b/chrome/browser/extensions/extension_preference_api.cc |
@@ -11,12 +11,12 @@ |
#include "base/stl_util.h" |
#include "base/stringprintf.h" |
#include "base/values.h" |
+#include "chrome/browser/extensions/api/proxy/proxy_api.h" |
#include "chrome/browser/extensions/extension_event_router.h" |
#include "chrome/browser/extensions/extension_preference_api_constants.h" |
#include "chrome/browser/extensions/extension_preference_helpers.h" |
#include "chrome/browser/extensions/extension_prefs.h" |
#include "chrome/browser/extensions/extension_prefs_scope.h" |
-#include "chrome/browser/extensions/extension_proxy_api.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/chrome_notification_types.h" |
@@ -214,7 +214,8 @@ class PrefMapping { |
} |
DCHECK_EQ(arraysize(kPrefMapping), mapping_.size()); |
DCHECK_EQ(arraysize(kPrefMapping), event_mapping_.size()); |
- RegisterPrefTransformer(prefs::kProxy, new ProxyPrefTransformer()); |
+ RegisterPrefTransformer(prefs::kProxy, |
+ new extensions::ProxyPrefTransformer()); |
RegisterPrefTransformer(prefs::kBlockThirdPartyCookies, |
new InvertBooleanTransformer()); |
} |