[Android] Remove the dependency on TabContents.

android_webview/lib/aw_browser_dependency_factory_impl.cc

 // 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.
 
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 
 // TODO(joth): Componentize or remove chrome/... dependencies.
 #include "android_webview/browser/net/aw_network_delegate.h"
 #include "android_webview/native/aw_contents_container.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserContext;
 using content::WebContents;
 
 namespace android_webview {
 
 namespace {
 
 base::LazyInstance<AwBrowserDependencyFactoryImpl>::Leaky g_lazy_instance;
 
-class TabContentsWrapper : public AwContentsContainer {
+class WebContentsWrapper : public AwContentsContainer {
  public:
-  TabContentsWrapper(TabContents* tab_contents) {
-    tab_contents_.reset(tab_contents);
+  WebContentsWrapper(WebContents* web_contents)
+      : web_contents_(web_contents) {
   }
 
-  virtual ~TabContentsWrapper() {}
+  virtual ~WebContentsWrapper() {}
 
   // AwContentsContainer
   virtual content::WebContents* GetWebContents() OVERRIDE {
-    return tab_contents_->web_contents();
+    return web_contents_.get();
   }
 
  private:
-  scoped_ptr<TabContents> tab_contents_;
+  scoped_ptr<content::WebContents> web_contents_;
 };
 
 }  // namespace
 
 AwBrowserDependencyFactoryImpl::AwBrowserDependencyFactoryImpl() {}
 
 AwBrowserDependencyFactoryImpl::~AwBrowserDependencyFactoryImpl() {}
 
 // static
 void AwBrowserDependencyFactoryImpl::InstallInstance() {
@@ skipping 35 matching lines @@
   return incognito ? profile->GetOffTheRecordProfile() : profile;
 }
 
 WebContents* AwBrowserDependencyFactoryImpl::CreateWebContents(bool incognito) {
   return content::WebContents::Create(
       GetBrowserContext(incognito), 0, MSG_ROUTING_NONE, 0);
 }
 
 AwContentsContainer* AwBrowserDependencyFactoryImpl::CreateContentsContainer(
     content::WebContents* contents) {
-  return new TabContentsWrapper(
-      TabContents::Factory::CreateTabContents(contents));

[Avi (use Gerrit), 2012/09/14 20:36:00]

Thank you. Please remove the friend declaration from TabContents::Factory.

+  return new WebContentsWrapper(contents);
 }
 
 content::JavaScriptDialogCreator*
     AwBrowserDependencyFactoryImpl::GetJavaScriptDialogCreator() {
   return GetJavaScriptDialogCreatorInstance();
 }
 
 }  // namespace android_webview