Remove the TestTabContents. This makes BrowserWithTestWindow use the

TestRenderViewHost instead. There are some changes to browser_commands_unittest
to support this. Now that we're using proper TabContentes, I had to stub out
a FocusManager call since there isn't a proper view hierarchy created.

Remove TabContents collection and switching from the NavigationController. I
tried to keep the same interface to the NavigationController since I tried that
in a previous patch and the change blew up.

Remove the TabContents factory. Callers now create a WebContents directly.
Review URL: http://codereview.chromium.org/67113

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13707 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 102 deletions

diff --git a/chrome/test/test_tab_contents.h b/chrome/test/test_tab_contents.h
deleted file mode 100644
index 91d3114..0000000
--- a/chrome/test/test_tab_contents.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef CHROME_BROWSER_TEST_TEST_TAB_CONTENTS_H_
-#define CHROME_BROWSER_TEST_TEST_TAB_CONTENTS_H_
-
-#include "base/string_util.h"
-#include "chrome/browser/tab_contents/tab_contents_factory.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-
-// TabContents typed created by TestTabContentsFactory.
-class TestTabContents : public TabContents {
- public:
-  explicit TestTabContents(TabContentsType type);
-
-  // Sets the site instance used by *ALL* TestTabContents.
-  static void set_site_instance(SiteInstance* site_instance) {
-    site_instance_ = site_instance;
-  }
-
-  int GetNextPageID() {
-    return next_page_id_++;
-  }
-
-  // Overridden from TabContents so we can provide a non-NULL site instance in
-  // some cases. To use, the test will have to set the site_instance_ member
-  // variable to some site instance it creates.
-  virtual SiteInstance* GetSiteInstance() const {
-    return site_instance_;
-  }
-
-  // Overrides to be more like WebContents (don't autocommit).
-  virtual bool NavigateToPendingEntry(bool reload);
-
- private:
-  static SiteInstance* site_instance_;
-
-  int next_page_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestTabContents);
-};
-
-// TestTabContentsFactory is a TabContentsFactory that can be used for tests.
-//
-// Use the CreateAndRegisterFactory method to create and register a new
-// TestTabContentsFactory. You can use scheme() to determine the resulting
-// scheme and type() for the resulting TabContentsType.
-//
-// TestTabContentsFactory unregisters itself from the TabContentsFactory in its
-// destructor.
-class TestTabContentsFactory : public TabContentsFactory {
- public:
-  // Creates a new TestTabContentsFactory and registers it for the next
-  // free TabContentsType. The destructor unregisters the factory.
-  static TestTabContentsFactory* CreateAndRegisterFactory() {
-    TabContentsType new_type = TabContentsFactory::NextUnusedType();
-    TestTabContentsFactory* new_factory =
-        new TestTabContentsFactory(
-            new_type, "test" + IntToString(static_cast<int>(new_type)));
-    TabContents::RegisterFactory(new_type, new_factory);
-    return new_factory;
-  }
-
-  TestTabContentsFactory(TabContentsType type, const std::string& scheme)
-      : type_(type),
-        scheme_(scheme) {
-  }
-
-  ~TestTabContentsFactory() {
-    TabContents::RegisterFactory(type_, NULL);
-  }
-
-  virtual TabContents* CreateInstance() {
-    return CreateInstanceImpl();
-  }
-
-  TestTabContents* CreateInstanceImpl() {
-    return new TestTabContents(type_);
-  }
-
-  virtual bool CanHandleURL(const GURL& url) {
-    return url.SchemeIs(scheme_.c_str());
-  }
-
-  const std::string& scheme() const { return scheme_; }
-
-  GURL test_url_with_path(const std::string& path) const {
-    return GURL(scheme() + ":" + path);
-  }
-
-  TabContentsType type() const { return type_; }
-
- private:
-  TabContentsType type_;
-
-  const std::string scheme_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestTabContentsFactory);
-};
-
-#endif  // CHROME_BROWSER_TEST_TEST_TAB_CONTENTS_H_