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

extensions/shell/browser/shell_extensions_browser_client.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/shell/browser/shell_extensions_browser_client.h"
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "extensions/browser/api/extensions_api_client.h"
@@ skipping 160 matching lines @@
 }
 
 ExtensionSystemProvider*
 ShellExtensionsBrowserClient::GetExtensionSystemFactory() {
   return ShellExtensionSystemFactory::GetInstance();
 }
 
 void ShellExtensionsBrowserClient::RegisterExtensionFunctions(
     ExtensionFunctionRegistry* registry) const {
   // Register core extension-system APIs.
-  core_api::GeneratedFunctionRegistry::RegisterAll(registry);
+  api::GeneratedFunctionRegistry::RegisterAll(registry);
 
   // app_shell-only APIs.
-  shell::api::GeneratedFunctionRegistry::RegisterAll(registry);
+  shell::api::ShellGeneratedFunctionRegistry::RegisterAll(registry);
 }
 
 void ShellExtensionsBrowserClient::RegisterMojoServices(
     content::RenderFrameHost* render_frame_host,
     const Extension* extension) const {
   RegisterServicesForFrame(render_frame_host, extension);
 }
 
 scoped_ptr<RuntimeAPIDelegate>
 ShellExtensionsBrowserClient::CreateRuntimeAPIDelegate(
@@ skipping 45 matching lines @@
   api_client_.reset(api_client);
 }
 
 ExtensionWebContentsObserver*
 ShellExtensionsBrowserClient::GetExtensionWebContentsObserver(
     content::WebContents* web_contents) {
   return ShellExtensionWebContentsObserver::FromWebContents(web_contents);
 }
 
 }  // namespace extensions