Add an extension override bubble and warning box for proxy extensions.

chrome/browser/extensions/settings_api_helpers.h

Index: chrome/browser/extensions/settings_api_helpers.h
diff --git a/chrome/browser/extensions/settings_api_helpers.h b/chrome/browser/extensions/settings_api_helpers.h
index db2ba36022a0ba95715c036f5336cfac6ef1e035..974e29291fc87862f89947f18b8cbf90501e45f5 100644
--- a/chrome/browser/extensions/settings_api_helpers.h
+++ b/chrome/browser/extensions/settings_api_helpers.h
@@ -43,6 +43,10 @@ const Extension* OverridesSearchEngine(
     api::manifest_types::ChromeSettingsOverrides::Search_provider*
         search_provider);
 
+// Returns which extension is overriding the proxy in a given |browser_context|.
+const Extension* OverridesProxy(

[Devlin, 2014/05/20 17:26:31]

I think "OverridesProxy()" is a little nondescript (especially since all of
these are top-level in the extensions namespace).  Maybe something like
GetExtensionOverridingProxy()?

[Finnur, 2014/05/21 16:30:32]

Done.

+    content::BrowserContext* browser_context);

[Devlin, 2014/05/20 17:26:31]

nit: fits on one line.

[Finnur, 2014/05/21 16:30:32]

Not anymore.

+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SETTINGS_API_HELPERS_H_