9 files changed, 20 insertions, 22 deletions
diff --git a/content/renderer/devtools/OWNERS b/content/renderer/devtools/OWNERS
deleted file mode 100644
index bb6028e..0000000
--- a/content/renderer/devtools/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-pfeldman@chromium.org
-yurys@chromium.org
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools_agent.cc
index 31269b0..91fc3b3 100644
--- a/content/renderer/devtools/devtools_agent.cc
+++ b/content/renderer/devtools_agent.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/devtools/devtools_agent.h"
+#include "content/renderer/devtools_agent.h"
 
 #include <map>
 
@@ -12,16 +12,16 @@
 #include "base/string_number_conversions.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/devtools/devtools_agent_filter.h"
-#include "content/renderer/devtools/devtools_client.h"
+#include "content/renderer/devtools_agent_filter.h"
+#include "content/renderer/devtools_client.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools_agent.h
index 9efe05ee..219a767 100644
--- a/content/renderer/devtools/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
-#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_AGENT_H_
+#define CONTENT_RENDERER_DEVTOOLS_AGENT_H_
 
 #include <string>
 
@@ -70,4 +70,4 @@ class DevToolsAgent : public RenderViewObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_AGENT_H_
diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools_agent_filter.cc
index 4aca9ac..f640c59 100644
--- a/content/renderer/devtools/devtools_agent_filter.cc
+++ b/content/renderer/devtools_agent_filter.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/devtools/devtools_agent_filter.h"
+#include "content/renderer/devtools_agent_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/devtools_messages.h"
-#include "content/renderer/devtools/devtools_agent.h"
+#include "content/renderer/devtools_agent.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
diff --git a/content/renderer/devtools/devtools_agent_filter.h b/content/renderer/devtools_agent_filter.h
index 9e4f8ae..627f749 100644
--- a/content/renderer/devtools/devtools_agent_filter.h
+++ b/content/renderer/devtools_agent_filter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
-#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_
+#define CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter {
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_
diff --git a/content/renderer/devtools/devtools_client.cc b/content/renderer/devtools_client.cc
index 09ec506..d4ea447 100644
--- a/content/renderer/devtools/devtools_client.cc
+++ b/content/renderer/devtools_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/devtools/devtools_client.h"
+#include "content/renderer/devtools_client.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools_client.h
index f5fa8f0..7e93008 100644
--- a/content/renderer/devtools/devtools_client.h
+++ b/content/renderer/devtools_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
-#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_CLIENT_H_
+#define CONTENT_RENDERER_DEVTOOLS_CLIENT_H_
 
 #include <string>
 
@@ -60,4 +60,4 @@ class DevToolsClient : public RenderViewObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_CLIENT_H_
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index f7da814..7b52bf1 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -48,7 +48,7 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/renderer/devtools/devtools_agent_filter.h"
+#include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
 #include "content/renderer/dom_storage/webstoragearea_impl.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 478898b..628d3cd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -68,7 +68,7 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 #include "content/renderer/device_orientation_dispatcher.h"
-#include "content/renderer/devtools/devtools_agent.h"
+#include "content/renderer/devtools_agent.h"
 #include "content/renderer/disambiguation_popup_helper.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"