[Android] Remove the dependency on TabContents.

android_webview/lib/aw_browser_dependency_factory_impl.cc

Index: android_webview/lib/aw_browser_dependency_factory_impl.cc
diff --git a/android_webview/lib/aw_browser_dependency_factory_impl.cc b/android_webview/lib/aw_browser_dependency_factory_impl.cc
index f31bb64e7971921c0621145bfd3b64042f4b2cb7..41e78c8c3e761c433520aa21e6966fb4a398e714 100644
--- a/android_webview/lib/aw_browser_dependency_factory_impl.cc
+++ b/android_webview/lib/aw_browser_dependency_factory_impl.cc
@@ -15,7 +15,6 @@
 #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"
@@ -30,21 +29,21 @@ 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
@@ -100,8 +99,7 @@ WebContents* AwBrowserDependencyFactoryImpl::CreateWebContents(bool incognito) {
 
 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*