Reverting 9855.

This change didn't have any description and it broke the tree
Review URL: http://codereview.chromium.org/21393

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

12 files changed, 2 insertions, 466 deletions

diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index f34a8f1..30d1a65 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -54,12 +54,6 @@ input_files = ChromeFileList([
     'debugger_window.h',
     'debugger_wrapper.cc',
     'debugger_wrapper.h',
-    'tools_contents.cc',
-    'tools_contents.h',
-    'tools_view.cc',
-    'tools_view.h',
-    'tools_window.cc',
-    'tools_window.h',
 ])
 
 if env.Bit('linux'):
@@ -68,9 +62,6 @@ if env.Bit('linux'):
       'debugger_contents.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-      'tools_contents.cc',
-      'tools_view.cc',
-      'tools_window.cc',
   )
 
 if env.Bit('mac'):
@@ -81,9 +72,6 @@ if env.Bit('mac'):
       'debugger_node.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-      'tools_contents.cc',
-      'tools_view.cc',
-      'tools_window.cc',
   )
 
 if not env.Bit('mac'):
diff --git a/chrome/browser/debugger/debugger.vcproj b/chrome/browser/debugger/debugger.vcproj
index e02dd18..d72b86a 100644
--- a/chrome/browser/debugger/debugger.vcproj
+++ b/chrome/browser/debugger/debugger.vcproj
@@ -213,30 +213,6 @@
 			RelativePath=".\debugger_wrapper.h"
 			>
 		</File>
-		<File
-			RelativePath=".\tools_contents.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\tools_contents.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tools_view.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\tools_view.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tools_window.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\tools_window.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/browser/debugger/tools_contents.cc b/chrome/browser/debugger/tools_contents.cc
deleted file mode 100644
index 0a95507..0000000
--- a/chrome/browser/debugger/tools_contents.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2009 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 "chrome/browser/debugger/tools_contents.h"

-

-#include "base/singleton.h"

-

-ToolsContents::ToolsContents(Profile* profile, SiteInstance* instance)

-    : WebContents(profile,

-                  instance,

-                  NULL,

-                  MSG_ROUTING_NONE,

-                  NULL) {

-  set_type(TAB_CONTENTS_TOOLS);

-}

-

-void ToolsContents::RendererCreated(RenderViewHost* render_view_host)  {

-  std::pair<int, int>* render_view_info =  

-      ToolsContents::GetInspectedViewInfoAccessor()->GetProperty(

-          property_bag());

-  DCHECK(render_view_info);

-  if (!render_view_info)

-    return;

-  

-  render_view_host->SetUpToolsClient(render_view_info->first,

-                                     render_view_info->second);

-  ToolsContents::GetInspectedViewInfoAccessor()->DeleteProperty(property_bag());

-}

-

-// static

-bool ToolsContents::IsToolsUrl(const GURL& url) {

-  // TODO(yurys): implement

-  return (url.SchemeIs("chrome-ui") && url.host() == "inspector" &&

-          url.path() == "/debugger-oop.html");

-}

-

-// static 

-PropertyAccessor<std::pair<int, int> >*

-    ToolsContents::GetInspectedViewInfoAccessor() {

-  return Singleton<PropertyAccessor<std::pair<int, int> > >().get();

-}

diff --git a/chrome/browser/debugger/tools_contents.h b/chrome/browser/debugger/tools_contents.h
deleted file mode 100644
index 61c804e..0000000
--- a/chrome/browser/debugger/tools_contents.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2009 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_DEBUGGER_TOOLS_CONTENTS_H_

-#define CHROME_BROWSER_DEBUGGER_TOOLS_CONTENTS_H_

-

-#include "chrome/browser/tab_contents/web_contents.h"

-#include "chrome/common/property_bag.h"

-

-// TODO(yurys): it may be made into DOMUI if the latter supports RendererCreated

-// notification.

-class ToolsContents : public WebContents {

- public:

-  ToolsContents(Profile* profile, SiteInstance* instance);

-

-  static bool IsToolsUrl(const GURL& url);

-

-  // (render process id, render view id)

-  static PropertyAccessor<std::pair<int, int> >* GetInspectedViewInfoAccessor();

-

- protected:

-  // WebContents overrides:

-  // We override updating history with a no-op so these pages

-  // are not saved to history.

-  virtual void UpdateHistoryForNavigation(const GURL& url,  

-      const ViewHostMsg_FrameNavigate_Params& params) { }

-

-  // Will notify just created renderer that it's going to host developer 

-  // tools UI.

-  virtual void RendererCreated(RenderViewHost* render_view_host);

-

-  DISALLOW_COPY_AND_ASSIGN(ToolsContents);

-};

-

-#endif  // CHROME_BROWSER_DEBUGGER_TOOLS_CONTENTS_H_

diff --git a/chrome/browser/debugger/tools_view.cc b/chrome/browser/debugger/tools_view.cc
deleted file mode 100644
index 13e04db..0000000
--- a/chrome/browser/debugger/tools_view.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2009 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 "chrome/browser/debugger/tools_view.h"

-

-#include "chrome/browser/browser_list.h"

-#include "chrome/browser/debugger/tools_contents.h"

-#include "chrome/browser/profile.h"

-#include "chrome/browser/tab_contents/web_contents.h"

-#include "chrome/browser/views/tab_contents_container_view.h"

-#include "chrome/common/property_bag.h"

-#include "chrome/common/render_messages.h"

-

-ToolsView::ToolsView(int inspected_process_id, int inspected_view_id) 

-    : inspected_process_id_(inspected_process_id),

-      inspected_view_id_(inspected_view_id), 

-      web_contents_(NULL) {

-  web_container_ = new TabContentsContainerView();

-  AddChildView(web_container_);

-}

-

-ToolsView::~ToolsView() {

-}

-

-void ToolsView::SendToolsClientMessage(int tools_message_type,

-                                       const std::wstring& body) {

-  if (!web_contents_) {

-    NOTREACHED();

-    return;

-  }

-  int routing_id = web_contents_->render_view_host()->routing_id();

-  web_contents_->render_view_host()->Send(

-      new ViewMsg_ToolsClientMsg(routing_id, tools_message_type, body));

-}

-

-std::string ToolsView::GetClassName() const {

-  return "ToolsView";

-}

-

-gfx::Size ToolsView::GetPreferredSize() {

-  return gfx::Size(700, 400);

-}

-

-void ToolsView::Layout() {

-  web_container_->SetBounds(0, 0, width(), height());

-}

-

-void ToolsView::ViewHierarchyChanged(bool is_add,

-                                     views::View* parent,

-                                     views::View* child) {

-  if (is_add && child == this) {

-    DCHECK(GetWidget());

-    Init();

-  }

-}

-

-void ToolsView::Init() {

-  // We can't create the WebContents until we've actually been put into a real

-  // view hierarchy somewhere.

-  Profile* profile = BrowserList::GetLastActive()->profile();

-  

-  TabContents* tc = TabContents::CreateWithType(TAB_CONTENTS_TOOLS, profile,

-                                                NULL);

-  web_contents_ = tc->AsWebContents();

-  web_contents_->SetupController(profile);

-  web_contents_->set_delegate(this);

-  web_container_->SetTabContents(web_contents_);

-  web_contents_->render_view_host()->AllowDOMUIBindings();

-

-  ToolsContents::GetInspectedViewInfoAccessor()->SetProperty(

-      web_contents_->property_bag(),

-      std::pair<int, int>(inspected_process_id_, inspected_view_id_));

-

-  GURL contents("chrome-ui://inspector/debugger-oop.html");

-  // this will call CreateRenderView to create renderer process 

-  web_contents_->controller()->LoadURL(contents, GURL(),

-                                       PageTransition::START_PAGE);

-}

-

-void ToolsView::OnWindowClosing() {

-  web_container_->SetTabContents(NULL); // detach last (and only) tab

-  web_contents_->CloseContents(); // destroy the tab and navigation controller

-}

-

-void ToolsView::OpenURLFromTab(TabContents* source,

-                               const GURL& url, const GURL& referrer,

-                               WindowOpenDisposition disposition,

-                               PageTransition::Type transition) {

-  NOTREACHED();

-}

diff --git a/chrome/browser/debugger/tools_view.h b/chrome/browser/debugger/tools_view.h
deleted file mode 100644
index 1c1de0a..0000000
--- a/chrome/browser/debugger/tools_view.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2009 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_DEBUGGER_TOOLS_VIEW_H_

-#define CHROME_BROWSER_DEBUGGER_TOOLS_VIEW_H_

-

-#include "base/basictypes.h"

-#include "base/gfx/size.h"

-#include "chrome/browser/tab_contents/tab_contents_delegate.h"

-#include "chrome/views/view.h"

-

-class TabContentsContainerView;

-class WebContents;

-

-class ToolsView : public views::View,

-                  public TabContentsDelegate {

- public:

-  explicit ToolsView (int inspected_process_id, int inspected_view_id);

-  virtual ~ToolsView();

-

-  void SendToolsClientMessage(int tools_message_type, const std::wstring& body);

-

-  // Destroy content views when the window is closing.

-  void OnWindowClosing();

-

- private:

-  // Overridden from TabContentsDelegate:

-  virtual void NavigationStateChanged(const TabContents* source,

-                                      unsigned changed_flags) {}

-  virtual void ReplaceContents(TabContents* source,

-                               TabContents* new_contents) {}

-  virtual void AddNewContents(TabContents* source,

-                              TabContents* new_contents,

-                              WindowOpenDisposition disposition,

-                              const gfx::Rect& initial_pos,

-                              bool user_gesture) {}

-  virtual void ActivateContents(TabContents* contents) {}

-  virtual void LoadingStateChanged(TabContents* source) {}

-  virtual void CloseContents(TabContents* source) {}

-  virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {}

-  virtual bool IsPopup(TabContents* source) { return false; }

-  virtual void ToolbarSizeChanged(TabContents* source, bool is_animating) {}

-  virtual void URLStarredChanged(TabContents* source, bool) {}

-  virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}

-  virtual bool CanBlur() const { return false; }

-  // Opens a new URL inside the passed in TabContents, if source is 0 open

-  // in the current front-most tab.

-  virtual void OpenURLFromTab(TabContents* source,

-                              const GURL& url, const GURL& referrer,

-                              WindowOpenDisposition disposition,

-                              PageTransition::Type transition);

-

-  // Overridden from views::View:

-  virtual std::string GetClassName() const;

-  virtual gfx::Size GetPreferredSize();

-  virtual void Layout();

-  virtual void ViewHierarchyChanged(bool is_add,

-                                    views::View* parent,

-                                    views::View* child);

-

-  void Init();

-

-  const int inspected_process_id_;

-  const int inspected_view_id_;

-  WebContents* web_contents_;

-  TabContentsContainerView* web_container_;

-

-  DISALLOW_COPY_AND_ASSIGN(ToolsView);

-};

-

-#endif // CHROME_BROWSER_DEBUGGER_TOOLS_VIEW_H_

diff --git a/chrome/browser/debugger/tools_window.cc b/chrome/browser/debugger/tools_window.cc
deleted file mode 100644
index f5a68cd..0000000
--- a/chrome/browser/debugger/tools_window.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2009 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 "chrome/browser/debugger/tools_window.h"

-

-#include "chrome/browser/debugger/tools_view.h"

-#include "chrome/views/window.h"

-

-ToolsWindow::ToolsWindow() : window_(NULL), tools_view_(NULL) {

-}

-

-ToolsWindow::~ToolsWindow() {

-}

-

-void ToolsWindow::Show(int inspected_process_id,

-                       int inspected_view_id) {

-  if (window_) {

-    window_->Show();

-    return;

-  }

-

-  tools_view_ = new ToolsView(inspected_process_id, inspected_view_id);

-  window_ = views::Window::CreateChromeWindow(NULL, gfx::Rect(), this);

-  window_->Show();

-}

-

-void ToolsWindow::SendToolsClientMessage(int tools_message_type,

-                                         const std::wstring& body) {

-  if (!tools_view_)

-    return;

-  tools_view_->SendToolsClientMessage(tools_message_type, body);

-}

-

-std::wstring ToolsWindow::GetWindowTitle() const {

-  return L"Developer Tools";

-}

-

-void ToolsWindow::WindowClosing() {

-  if (tools_view_) {

-    tools_view_->OnWindowClosing();

-    tools_view_ = NULL;

-    window_ = NULL;

-  }

-}

-

-bool ToolsWindow::CanResize() const {

-  return true;

-}

-

-views::View* ToolsWindow::GetContentsView() {

-  return tools_view_;

-}

diff --git a/chrome/browser/debugger/tools_window.h b/chrome/browser/debugger/tools_window.h
deleted file mode 100644
index cc03a44..0000000
--- a/chrome/browser/debugger/tools_window.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2009 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_DEBUGGER_TOOLS_WINDOW_H_

-#define CHROME_BROWSER_DEBUGGER_TOOLS_WINDOW_H_

-

-#include "base/basictypes.h"

-

-// TODO(yurys): port to other platforms

-#if defined(OS_WIN)

-

-#include "chrome/views/window_delegate.h"

-

-namespace views {

-class Window;

-}

-class ToolsView;

-class TabContents;

-

-class ToolsWindow : public views::WindowDelegate {

- public:

-  ToolsWindow();

-  virtual ~ToolsWindow();

-

-  // Show inspector window for the tab

-  void Show(int inspected_process_id,

-            int inspected_view_id);

-

-  void SendToolsClientMessage(int tools_message_type, 

-                              const std::wstring& body);

-

- private:

-  // views::WindowDelegate methods:

-  virtual std::wstring GetWindowTitle() const;

-  virtual void WindowClosing();

-  virtual bool CanResize() const;

-  virtual views::View* GetContentsView();

-

-  views::Window* window_;

-  ToolsView* tools_view_;

-

-  DISALLOW_COPY_AND_ASSIGN(ToolsWindow);

-};

-

-#else // defined(OS_WIN)

-

-class ToolsWindow {

- public:

-  ToolsWindow() {};

-  virtual ~ToolsWindow() {};

-

-  // Show inspector window for the tab

-  void Show(int inspected_process_id,

-            int inspected_view_id) {};

-

-  void SendToolsClientMessage(int tools_message_type, 

-                              const std::wstring& body) {}

-

- private:

-  DISALLOW_COPY_AND_ASSIGN(ToolsWindow);

-};

-

-#endif // OS_WIN

-

-#endif // CHROME_BROWSER_DEBUGGER_TOOLS_WINDOW_H_

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 9750d82..8c64d5f 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/debugger/tools_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
@@ -88,7 +87,6 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       renderer_initialized_(false),
       waiting_for_drag_context_response_(false),
       debugger_attached_(false),
-      tools_window_(NULL),
       enable_dom_ui_bindings_(false),
       pending_request_id_(0),
       enable_external_host_bindings_(false),
@@ -98,9 +96,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       run_modal_reply_msg_(NULL),
       has_unload_listener_(false),
       is_waiting_for_unload_ack_(false),
-      are_javascript_messages_suppressed_(false),
-      inspected_process_id_(0),
-      inspected_view_id_(0) {
+      are_javascript_messages_suppressed_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
   if (modal_dialog_event == NULL)
@@ -558,12 +554,6 @@ void RenderViewHost::ShowJavaScriptConsole() {
   Send(new ViewMsg_ShowJavaScriptConsole(routing_id()));
 }
 
-void RenderViewHost::ShowDeveloperTools() {
-  if (!tools_window_.get())
-    tools_window_.reset(new ToolsWindow);
-  tools_window_->Show(process()->host_id(), routing_id());
-}
-
 void RenderViewHost::DragSourceEndedAt(
     int client_x, int client_y, int screen_x, int screen_y) {
   Send(new ViewMsg_DragSourceEndedOrMoved(
@@ -592,16 +582,6 @@ void RenderViewHost::AllowDOMUIBindings() {
       process()->host_id());
 }
 
-void RenderViewHost::SetUpToolsClient(int inspected_process_id, 
-                                      int inspected_view_id) {
-  RendererSecurityPolicy::GetInstance()->GrantDOMUIBindings(
-      process()->host_id());
-  Send(new ViewMsg_SetUpToolsClient(routing_id()));
-
-  inspected_process_id_ = inspected_process_id;
-  inspected_view_id_ = inspected_view_id;
-}
-
 void RenderViewHost::AllowExternalHostBindings() {
   enable_external_host_bindings_ = true;
 }
@@ -752,8 +732,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DebuggerOutput, OnDebuggerOutput);
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidDebugAttach, DidDebugAttach);
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ToolsAgentMsg, OnToolsAgentMsg);
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ToolsClientMsg, OnToolsClientMsg);
     IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction,
                         OnUserMetricsRecordAction)
     IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus);
@@ -1193,26 +1171,6 @@ void RenderViewHost::DidDebugAttach() {
   }
 }
 
-void RenderViewHost::OnToolsAgentMsg(int tools_message_type,
-                                     const std::wstring& body) {
-  RenderViewHost* host = RenderViewHost::FromID(inspected_process_id_, 
-                                                inspected_view_id_);
-  CHECK(host);
-  if (host) {
-    host->Send(new ViewMsg_ToolsAgentMsg(
-        inspected_view_id_, tools_message_type, body));
-  }
-}
-
-void RenderViewHost::OnToolsClientMsg(int tools_message_type,
-                                      const std::wstring& body) {
-  if (!tools_window_.get()) {
-    NOTREACHED();
-    return;
-  }
-  tools_window_->SendToolsClientMessage(tools_message_type, body);
-}
-
 void RenderViewHost::OnUserMetricsRecordAction(const std::wstring& action) {
   UserMetrics::RecordComputedAction(action.c_str(), process()->profile());
 }
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 6c39393..2f36219 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -26,7 +26,6 @@ class NavigationEntry;
 class RenderViewHostDelegate;
 class SiteInstance;
 class SkBitmap;
-class ToolsWindow;
 class ViewMsg_Navigate;
 struct ContextMenuParams;
 struct ViewHostMsg_DidPrintPage_Params;
@@ -292,9 +291,6 @@ class RenderViewHost : public RenderWidgetHost {
   // Show the JavaScript console.
   void ShowJavaScriptConsole();
 
-  // Show the Web Inspector.
-  void ShowDeveloperTools();
-
   // Notifies the renderer that a drop occurred. This is necessary because the
   // render may be the one that started the drag.
   void DragSourceEndedAt(
@@ -324,11 +320,6 @@ class RenderViewHost : public RenderWidgetHost {
   // Must be called before CreateRenderView().
   void AllowDOMUIBindings();
 
-  // Tell the render view to connect as a tools client to the specified 
-  // renderer. Must be called when RenderView is created but before any 
-  // navigation.
-  void SetUpToolsClient(int inspected_process_id, int inspected_view_id);
-
   // Sets a property with the given name and value on the DOM UI binding object.
   // Must call AllowDOMUIBindings() on this renderer first.
   void SetDOMUIProperty(const std::string& name, const std::string& value);
@@ -515,8 +506,6 @@ class RenderViewHost : public RenderWidgetHost {
                              const std::wstring& source_id);
   void OnDebuggerOutput(const std::wstring& output);
   void DidDebugAttach();
-  void OnToolsAgentMsg(int tools_message_type, const std::wstring& body);
-  void OnToolsClientMsg(int tools_message_type, const std::wstring& body);
   void OnUserMetricsRecordAction(const std::wstring& action);
   void OnMissingPluginStatus(int status);
   void OnMessageReceived(IPC::Message* msg) { }
@@ -572,12 +561,9 @@ class RenderViewHost : public RenderWidgetHost {
   // information.
   bool waiting_for_drag_context_response_;
 
-  // If the debugger attached to us or not.
+  // is the debugger attached to us or not
   bool debugger_attached_;
 
-  // Allows to show exactly one developer tools window for this render view.
-  scoped_ptr<ToolsWindow> tools_window_;
-
   // True if we've been told to set up the the Javascript bindings for
   // sending messages back to the browser.
   bool enable_dom_ui_bindings_;
@@ -624,10 +610,6 @@ class RenderViewHost : public RenderWidgetHost {
 
   bool are_javascript_messages_suppressed_;
 
-  int inspected_process_id_;
-
-  int inspected_view_id_;
-
   DISALLOW_EVIL_CONSTRUCTORS(RenderViewHost);
 };
 
diff --git a/chrome/browser/tab_contents/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc
index 64f0605..18f3569 100644
--- a/chrome/browser/tab_contents/tab_contents_factory.cc
+++ b/chrome/browser/tab_contents/tab_contents_factory.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/debugger/debugger_contents.h"
-#include "chrome/browser/debugger/tools_contents.h"
 #include "chrome/browser/tab_contents/native_ui_contents.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_factory.h"
@@ -62,9 +61,6 @@ TabContents* TabContents::CreateWithType(TabContentsType type,
     case TAB_CONTENTS_DEBUGGER:
       contents = new DebuggerContents(profile, instance);
       break;
-    case TAB_CONTENTS_TOOLS:
-      contents = new ToolsContents(profile, instance);
-      break;
     case TAB_CONTENTS_DOM_UI:
       contents = new DOMUIContents(profile, instance, NULL);
       break;
@@ -112,9 +108,6 @@ TabContentsType TabContents::TypeForURL(GURL* url) {
   if (DebuggerContents::IsDebuggerUrl(*url))
     return TAB_CONTENTS_DEBUGGER;
 
-  if (ToolsContents::IsToolsUrl(*url))
-    return TAB_CONTENTS_TOOLS;
-
   if (url->SchemeIs(DOMUIContents::GetScheme().c_str()))
     return TAB_CONTENTS_DOM_UI;
 
diff --git a/chrome/browser/tab_contents/tab_contents_type.h b/chrome/browser/tab_contents/tab_contents_type.h
index 6a8afd9..87cd6452 100644
--- a/chrome/browser/tab_contents/tab_contents_type.h
+++ b/chrome/browser/tab_contents/tab_contents_type.h
@@ -21,7 +21,6 @@ enum TabContentsType {
   TAB_CONTENTS_ABOUT_UI,
   TAB_CONTENTS_DEBUGGER,
   TAB_CONTENTS_DOM_UI,
-  TAB_CONTENTS_TOOLS,
   TAB_CONTENTS_NUM_TYPES
 };