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

extensions/browser/api/vpn_provider/vpn_provider_api.cc

 // 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.
 
 #include "extensions/browser/api/vpn_provider/vpn_provider_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "extensions/common/api/vpn_provider.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace extensions {
 
 namespace {
 
-namespace api_vpn = extensions::core_api::vpn_provider;
+namespace api_vpn = extensions::api::vpn_provider;
 
 const char kCIDRSeperator[] = "/";
 
 bool CheckIPCIDRSanity(const std::string& value, bool cidr, bool ipv6) {
   int dots = ipv6 ? 0 : 3;
   int sep = cidr ? 1 : 0;
   int colon = ipv6 ? 7 : 0;
   bool hex_allowed = ipv6;
   int counter = 0;
 
@@ skipping 288 matching lines @@
                      SignalCallCompletionSuccess,
                  this),
       base::Bind(&VpnProviderNotifyConnectionStateChangedFunction::
                      SignalCallCompletionFailure,
                  this));
 
   return RespondLater();
 }
 
 }  // namespace extensions