Moving chromoting browser_tests to chrome/test.

Moving chromoting browser_tests per the suggestion from jam. Chrome is a leaf component thus shouldn't be depended on by remoting.

The code is unchanged except that:
1. The references to the remoting/test paths are updated.
2. I added an OWNERS file
3. chrome entries in the DEPS file are removed.

BUG=

Review URL: https://codereview.chromium.org/26695006

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

14 files changed, 45 insertions, 42 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 40e460f..1ea07ba 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -930,16 +930,6 @@
         '../components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc',
         '../components/autofill/content/renderer/test_password_autofill_agent.h',
         '../components/autofill/content/renderer/test_password_autofill_agent.cc',
-        '../remoting/test/auth_browsertest.cc',
-        '../remoting/test/launch_browsertest.cc',
-        '../remoting/test/key_code_conv.cc',
-        '../remoting/test/key_code_conv.h',
-        '../remoting/test/key_code_map.h',
-        '../remoting/test/me2me_browsertest.cc',
-        '../remoting/test/remote_desktop_browsertest.cc',
-        '../remoting/test/remote_desktop_browsertest.h',
-        '../remoting/test/waiter.cc',
-        '../remoting/test/waiter.h',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
@@ -1542,6 +1532,16 @@
         'test/gpu/gpu_feature_browsertest.cc',
         'test/gpu/webgl_infobar_browsertest.cc',
         'test/ppapi/ppapi_browsertest.cc',
+        'test/remoting/auth_browsertest.cc',
+        'test/remoting/launch_browsertest.cc',
+        'test/remoting/key_code_conv.cc',
+        'test/remoting/key_code_conv.h',
+        'test/remoting/key_code_map.h',
+        'test/remoting/me2me_browsertest.cc',
+        'test/remoting/remote_desktop_browsertest.cc',
+        'test/remoting/remote_desktop_browsertest.h',
+        'test/remoting/waiter.cc',
+        'test/remoting/waiter.h',
         'test/security_tests/sandbox_browsertest_linux.cc',
         'test/security_tests/sandbox_browsertest_win.cc',
         # TODO(craig): Rename this and run from base_unittests when the test
diff --git a/chrome/test/remoting/DEPS b/chrome/test/remoting/DEPS
new file mode 100644
index 0000000..a9835e6
--- /dev/null
+++ b/chrome/test/remoting/DEPS
@@ -0,0 +1,4 @@
+include_rules = [
+  "+net",
+  "+ui/events/keycodes",
+]
diff --git a/chrome/test/remoting/OWNERS b/chrome/test/remoting/OWNERS
new file mode 100644
index 0000000..861085c
--- /dev/null
+++ b/chrome/test/remoting/OWNERS
@@ -0,0 +1,7 @@
+garykac@chromium.org
+jamiewalch@chromium.org
+lambroslambrou@chromium.org
+rmsousa@chromium.org
+sergeyu@chromium.org
+weitaosu@chromium.org
+wez@chromium.org
diff --git a/remoting/test/auth_browsertest.cc b/chrome/test/remoting/auth_browsertest.cc
index fcb3987..a85f690 100644
--- a/remoting/test/auth_browsertest.cc
+++ b/chrome/test/remoting/auth_browsertest.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 "remote_desktop_browsertest.h"
+#include "chrome/test/remoting/remote_desktop_browsertest.h"
 
 namespace remoting {
 
diff --git a/remoting/test/key_code_conv.cc b/chrome/test/remoting/key_code_conv.cc
index 2343032..baa87bd 100644
--- a/remoting/test/key_code_conv.cc
+++ b/chrome/test/remoting/key_code_conv.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/test/key_code_conv.h"
+#include "chrome/test/remoting/key_code_conv.h"
 
-#include "remoting/test/key_code_map.h"
+#include "chrome/test/remoting/key_code_map.h"
 
 namespace remoting {
 
diff --git a/remoting/test/key_code_conv.h b/chrome/test/remoting/key_code_conv.h
index da00413..a7d297a 100644
--- a/remoting/test/key_code_conv.h
+++ b/chrome/test/remoting/key_code_conv.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 REMOTING_TEST_KEY_CODE_CONV_H_
-#define REMOTING_TEST_KEY_CODE_CONV_H_
+#ifndef CHROME_TEST_REMOTING_KEY_CODE_CONV_H_
+#define CHROME_TEST_REMOTING_KEY_CODE_CONV_H_
 
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ -22,4 +22,4 @@ void GetKeyValuesFromChar(
 
 }  // namespace remoting
 
-#endif  // REMOTING_TEST_KEY_CODE_CONV_H_
+#endif  // CHROME_TEST_REMOTING_KEY_CODE_CONV_H_
diff --git a/remoting/test/key_code_map.h b/chrome/test/remoting/key_code_map.h
index 81d76d9..2cda3ef 100644
--- a/remoting/test/key_code_map.h
+++ b/chrome/test/remoting/key_code_map.h
@@ -6,8 +6,8 @@
 //  1. ui/base/keycodes/keycode_converter_data.h
 //  2. ui/events/keycodes/keyboard_codes.h
 //  3. third_party/WebKit/Source/core/platform/chromium/KeyboardCodes.h
-#ifndef REMOTING_TEST_KEY_CODE_MAP_H_
-#define REMOTING_TEST_KEY_CODE_MAP_H_
+#ifndef CHROME_TEST_REMOTING_KEY_CODE_MAP_H_
+#define CHROME_TEST_REMOTING_KEY_CODE_MAP_H_
 
 #include "base/basictypes.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -91,4 +91,4 @@ const KeyCodeMap key_code_map[] = {
 
 }  // namespace remoting
 
-#endif  // REMOTING_TEST_KEY_CODE_MAP_H_
+#endif  // CHROME_TEST_REMOTING_KEY_CODE_MAP_H_
diff --git a/remoting/test/launch_browsertest.cc b/chrome/test/remoting/launch_browsertest.cc
index 4c9804e..c08d69c 100644
--- a/remoting/test/launch_browsertest.cc
+++ b/chrome/test/remoting/launch_browsertest.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 "remote_desktop_browsertest.h"
+#include "chrome/test/remoting/remote_desktop_browsertest.h"
 
 namespace remoting {
 
diff --git a/remoting/test/me2me_browsertest.cc b/chrome/test/remoting/me2me_browsertest.cc
index bc3baca..7cfdda7 100644
--- a/remoting/test/me2me_browsertest.cc
+++ b/chrome/test/remoting/me2me_browsertest.cc
@@ -4,8 +4,8 @@
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "remoting/test/remote_desktop_browsertest.h"
-#include "remoting/test/waiter.h"
+#include "chrome/test/remoting/remote_desktop_browsertest.h"
+#include "chrome/test/remoting/waiter.h"
 
 namespace remoting {
 
diff --git a/remoting/test/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index ca4a0b7..f56bacc 100644
--- a/remoting/test/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remote_desktop_browsertest.h"
+#include "chrome/test/remoting/remote_desktop_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
+#include "chrome/test/remoting/key_code_conv.h"
+#include "chrome/test/remoting/waiter.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
-#include "remoting/test/key_code_conv.h"
-#include "remoting/test/waiter.h"
 
 using extensions::Extension;
 
diff --git a/remoting/test/remote_desktop_browsertest.h b/chrome/test/remoting/remote_desktop_browsertest.h
index 6d12031..32c2911 100644
--- a/remoting/test/remote_desktop_browsertest.h
+++ b/chrome/test/remoting/remote_desktop_browsertest.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 REMOTE_DESKTOP_BROWSER_TEST_H_
-#define REMOTE_DESKTOP_BROWSER_TEST_H_
+#ifndef CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
+#define CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ -31,7 +31,7 @@ inline void _ASSERT_TRUE(bool condition) {
   return;
 }
 
-}
+}  // namespace
 
 namespace remoting {
 
@@ -287,4 +287,4 @@ class RemoteDesktopBrowserTest : public ExtensionBrowserTest {
 
 }  // namespace remoting
 
-#endif  // REMOTE_DESKTOP_BROWSER_TEST_H_
+#endif  // CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
diff --git a/remoting/test/waiter.cc b/chrome/test/remoting/waiter.cc
index ccc2920..7296068 100644
--- a/remoting/test/waiter.cc
+++ b/chrome/test/remoting/waiter.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 "remoting/test/waiter.h"
+#include "chrome/test/remoting/waiter.h"
 
 #include "content/public/test/test_utils.h"
 
diff --git a/remoting/test/waiter.h b/chrome/test/remoting/waiter.h
index 71e64a8..c4a1d5a 100644
--- a/remoting/test/waiter.h
+++ b/chrome/test/remoting/waiter.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 REMOTING_TEST_WAITER_H_
-#define REMOTING_TEST_WAITER_H_
+#ifndef CHROME_TEST_REMOTING_WAITER_H_
+#define CHROME_TEST_REMOTING_WAITER_H_
 
 #include "base/timer/timer.h"
 
@@ -19,7 +19,7 @@ namespace remoting {
 // the wait will keep running.
 class TimeoutWaiter {
  public:
-  TimeoutWaiter(base::TimeDelta timeout);
+  explicit TimeoutWaiter(base::TimeDelta timeout);
   virtual ~TimeoutWaiter();
 
   // Returns true in case of success.
@@ -71,4 +71,4 @@ class ConditionalTimeoutWaiter : public TimeoutWaiter {
 
 }  // namespace remoting
 
-#endif  // REMOTING_TEST_WAITER_H_
+#endif  // CHROME_TEST_REMOTING_WAITER_H_
diff --git a/remoting/test/DEPS b/remoting/test/DEPS
deleted file mode 100644
index 51dc116..0000000
--- a/remoting/test/DEPS
+++ /dev/null
@@ -1,8 +0,0 @@
-include_rules = [
-  "+chrome/browser",
-  "+chrome/common",
-  "+chrome/test",
-  "+content/public",
-  "+net",
-  "+ui/events/keycodes",
-]