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

chrome/browser/extensions/settings_api_helpers.h

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_SETTINGS_API_HELPERS_H_
 #define CHROME_BROWSER_EXTENSIONS_SETTINGS_API_HELPERS_H_
 
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 namespace content {
@@ skipping 25 matching lines @@
                                        std::vector<GURL>* startup_pages);
 
 // Returns which extension is overriding the search engine in a given
 // |browser_context|. |search_provider|, if non-NULL, will contain the search
 // provider the extension has set.
 const Extension* OverridesSearchEngine(
     content::BrowserContext* browser_context,
     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_