Generate all extension schema namespaces as "api" and instead vary the generated bundle names.

extensions/browser/api/vpn_provider/vpn_service.h

 // Copyright 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 EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 #define EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 125 matching lines @@
   void SendPacket(const std::string& extension_id,
                   const std::vector<char>& data,
                   const SuccessCallback& success,
                   const FailureCallback& failure);
 
   // Notifies connection state |state| to the active VPN configuration after
   // verifying that it belongs to the extension with id |extension_id|.
   // Calls |success| or |failure| based on the outcome.
   void NotifyConnectionStateChanged(
       const std::string& extension_id,
-      extensions::core_api::vpn_provider::VpnConnectionState state,
+      extensions::api::vpn_provider::VpnConnectionState state,
       const SuccessCallback& success,
       const FailureCallback& failure);
 
   // Verifies if a configuration with name |configuration_name| exists for the
   // extension with id |extension_id|.
   bool VerifyConfigExistsForTesting(const std::string& extension_id,
                                     const std::string& configuration_name);
 
   // Verifies if the extension has a configuration that is connected.
   bool VerifyConfigIsConnectedForTesting(const std::string& extension_id);
@@ skipping 84 matching lines @@
   StringToConfigurationMap service_path_to_configuration_map_;
 
   base::WeakPtrFactory<VpnService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VpnService);
 };
 
 }  // namespace chromeos
 
 #endif  // EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_