Move ContentAppModelBuilder to athena/extensions.

athena/athena.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 129 matching lines @@
       ],
       'sources': [
         'content/app_activity.cc',
         'content/app_activity.h',
         'content/app_activity_proxy.cc',
         'content/app_activity_proxy.h',
         'content/app_activity_registry.cc',
         'content/app_activity_registry.h',
         'content/app_registry_impl.cc',
         'content/content_activity_factory.cc',
-        'content/content_app_model_builder.cc',
+        'extensions/extension_app_model_builder.cc',
         'content/public/app_registry.h',
         'content/content_activity_factory.h',
         'content/public/content_activity_factory_creator.h',
-        'content/public/content_app_model_builder.h',
+        'extensions/public/extension_app_model_builder.h',
         'content/public/web_contents_view_delegate_creator.h',
         'content/render_view_context_menu_impl.cc',
         'content/render_view_context_menu_impl.h',
         'content/web_activity.cc',
         'content/web_activity.h',
         'content/web_contents_view_delegate_factory_impl.cc',
         'extensions/public/extensions_delegate.h',
         'extensions/extensions_delegate.cc',
         'virtual_keyboard/public/virtual_keyboard_manager.h',
         'virtual_keyboard/virtual_keyboard_manager_impl.cc',
@@ skipping 88 matching lines @@
         'screen/screen_manager_unittest.cc',
         'test/athena_unittests.cc',
         'wm/split_view_controller_unittest.cc',
         'wm/window_list_provider_impl_unittest.cc',
         'wm/window_manager_unittest.cc',
       ],
     }
   ],
 }