Move Proxy Settings API from chrome/browser/extensions to chrome/browser/eextensions/api/proxy

chrome/browser/extensions/api/proxy/proxy_api.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 // Implementation of the Chrome Extensions Proxy Settings API.
 
-#include "chrome/browser/extensions/extension_proxy_api.h"
+#include "chrome/browser/extensions/api/proxy/proxy_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
+#include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
-#include "chrome/browser/extensions/extension_proxy_api_constants.h"
-#include "chrome/browser/extensions/extension_proxy_api_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "net/base/net_errors.h"
 
-namespace helpers = extension_proxy_api_helpers;
-namespace keys = extension_proxy_api_constants;
+namespace extensions {
+
+namespace helpers = proxy_api_helpers;
+namespace keys = proxy_api_constants;
 
 // static
-ExtensionProxyEventRouter* ExtensionProxyEventRouter::GetInstance() {
-  return Singleton<ExtensionProxyEventRouter>::get();
+ProxyEventRouter* ProxyEventRouter::GetInstance() {
+  return Singleton<ProxyEventRouter>::get();
 }
 
-ExtensionProxyEventRouter::ExtensionProxyEventRouter() {
+ProxyEventRouter::ProxyEventRouter() {
 }
 
-ExtensionProxyEventRouter::~ExtensionProxyEventRouter() {
+ProxyEventRouter::~ProxyEventRouter() {
 }
 
-void ExtensionProxyEventRouter::OnProxyError(
+void ProxyEventRouter::OnProxyError(
     ExtensionEventRouterForwarder* event_router,
     void* profile,
     int error_code) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(keys::kProxyEventFatal, true);
   dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
   dict->SetString(keys::kProxyEventDetails, "");
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   if (profile) {
     event_router->DispatchEventToRenderers(
         keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
   } else {
     event_router->BroadcastEventToRenderers(
         keys::kProxyEventOnProxyError, json_args, GURL());
   }
 }
 
-void ExtensionProxyEventRouter::OnPACScriptError(
+void ProxyEventRouter::OnPACScriptError(
     ExtensionEventRouterForwarder* event_router,
     void* profile,
     int line_number,
     const string16& error) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(keys::kProxyEventFatal, false);
   dict->SetString(keys::kProxyEventError,
                   net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED));
   std::string error_msg;
@@ skipping 107 matching lines @@
       if (!proxy_rules_dict)
         return NULL;
       extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
       break;
     }
     case ProxyPrefs::kModeCount:
       NOTREACHED();
   }
   return extension_pref.release();
 }
+
+}  // namespace extensions