7 files changed, 12 insertions, 14 deletions
diff --git a/chrome/common/devtools_messages.h b/chrome/common/devtools_messages.h
index 6c095f4..a46d72b 100644
--- a/chrome/common/devtools_messages.h
+++ b/chrome/common/devtools_messages.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_DEVTOOLS_MESSAGES_H_
 
 #include "ipc/ipc_message_utils.h"
-#include "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
 
 namespace IPC {
 
diff --git a/chrome/common/devtools_messages_internal.h b/chrome/common/devtools_messages_internal.h
index d48ec09..dcc8eee 100644
--- a/chrome/common/devtools_messages_internal.h
+++ b/chrome/common/devtools_messages_internal.h
@@ -43,7 +43,7 @@
 // This file describes developer tools message types.
 
 #include "ipc/ipc_message_macros.h"
-#include "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
 
 // These are messages sent from DevToolsAgent to DevToolsClient through the
 // browser.
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 57c2f20..583c7df 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -13,7 +13,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebDevToolsAgent;
diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc
index d3a8289..5eb54ed 100644
--- a/chrome/renderer/devtools_agent_filter.cc
+++ b/chrome/renderer/devtools_agent_filter.cc
@@ -13,7 +13,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
 
 using WebKit::WebDevToolsAgent;
 using WebKit::WebString;
diff --git a/webkit/glue/devtools/devtools_message_data.cc b/webkit/glue/devtools_message_data.cc
index 12e2064..a9af3c5 100644
--- a/webkit/glue/devtools/devtools_message_data.cc
+++ b/webkit/glue/devtools_message_data.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 "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
 
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
@@ -12,15 +12,13 @@ using WebKit::WebString;
 using WebKit::WebVector;
 
 DevToolsMessageData::DevToolsMessageData(const WebDevToolsMessageData& data)
-    : class_name(data.className.utf8())
-    , method_name(data.methodName.utf8())
-{
+    : class_name(data.className.utf8()),
+      method_name(data.methodName.utf8()) {
   for (size_t i = 0; i < data.arguments.size(); i++)
     arguments.push_back(data.arguments[i].utf8());
 }
 
-WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const
-{
+WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const {
   WebDevToolsMessageData result;
   result.className = WebString::fromUTF8(class_name);
   result.methodName = WebString::fromUTF8(method_name);
diff --git a/webkit/glue/devtools/devtools_message_data.h b/webkit/glue/devtools_message_data.h
index 7fc7095..31daa14 100644
--- a/webkit/glue/devtools/devtools_message_data.h
+++ b/webkit/glue/devtools_message_data.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 WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
-#define WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
+#ifndef WEBKIT_GLUE_DEVTOOLS_MESSAGE_DATA_H_
+#define WEBKIT_GLUE_DEVTOOLS_MESSAGE_DATA_H_
 
 #include <string>
 #include <vector>
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 30f46ab..fbc5f8b 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -243,8 +243,8 @@
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
-        'glue/devtools/devtools_message_data.cc',
-        'glue/devtools/devtools_message_data.h',
+        'glue/devtools_message_data.cc',
+        'glue/devtools_message_data.h',
         'glue/media/buffered_data_source.cc',
         'glue/media/buffered_data_source.h',
         'glue/media/media_resource_loader_bridge_factory.cc',