Removed DeviceTestSuite, the main source for content dependency from

device/bluetooth side.


BUG=


Review URL: https://chromiumcodereview.appspot.com/12049042

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

5 files changed, 4 insertions, 46 deletions

diff --git a/device/bluetooth/DEPS b/device/bluetooth/DEPS
index 730c30e..726572a 100644
--- a/device/bluetooth/DEPS
+++ b/device/bluetooth/DEPS
@@ -1,7 +1,4 @@
 include_rules = [
-  "+chrome/common",
-  "+chrome/test/base",
-  "+content/public/test",
   "+chromeos/dbus",
   "+dbus",
   "+grit",
diff --git a/device/device.gyp b/device/device.gyp
index 7d3af8e..c31519f 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -11,6 +11,8 @@
       'target_name': 'device_bluetooth',
       'type': 'static_library',
       'dependencies': [
+          '../base/base.gyp:base',
+          '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
           '../chrome/chrome_resources.gyp:chrome_strings',
           '../third_party/libxml/libxml.gyp:libxml',
           '../ui/ui.gyp:ui'
@@ -132,7 +134,6 @@
         'device_bluetooth_mocks',
         'device_usb',
         '../base/base.gyp:test_support_base',
-        '../content/content.gyp:test_support_content',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
@@ -144,8 +145,6 @@
         'bluetooth/bluetooth_service_record_win_unittest.cc',
         'bluetooth/bluetooth_task_manager_win_unittest.cc',
         'bluetooth/bluetooth_utils_unittest.cc',
-        'test/device_test_suite.cc',
-        'test/device_test_suite.h',
         'test/run_all_unittests.cc',
         'usb/usb_ids_unittest.cc',
       ],
diff --git a/device/test/device_test_suite.cc b/device/test/device_test_suite.cc
deleted file mode 100644
index 6556076..0000000
--- a/device/test/device_test_suite.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2012 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 "device/test/device_test_suite.h"
-
-#include "content/public/common/content_client.h"
-
-DeviceTestSuite::DeviceTestSuite(int argc, char** argv)
-    : content::ContentTestSuiteBase(argc, argv) {
-}
-
-DeviceTestSuite::~DeviceTestSuite() {
-}
-
-content::ContentClient* DeviceTestSuite::CreateClientForInitialization() {
-  return new content::ContentClient();
-}
diff --git a/device/test/device_test_suite.h b/device/test/device_test_suite.h
deleted file mode 100644
index 15059ab..0000000
--- a/device/test/device_test_suite.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2012 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 DEVICE_TEST_DEVICE_TEST_SUITE_H_
-#define DEVICE_TEST_DEVICE_TEST_SUITE_H_
-
-#include "content/public/test/content_test_suite_base.h"
-
-class DeviceTestSuite : public content::ContentTestSuiteBase {
- public:
-  DeviceTestSuite(int argc, char** argv);
-  virtual ~DeviceTestSuite();
-
- protected:
-  virtual content::ContentClient* CreateClientForInitialization() OVERRIDE;
-};
-
-#endif  // DEVICE_TEST_DEVICE_TEST_SUITE_H_
diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc
index 36e6e51..f4b4fc8 100644
--- a/device/test/run_all_unittests.cc
+++ b/device/test/run_all_unittests.cc
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/test/unittest_test_suite.h"
-#include "device/test/device_test_suite.h"
+#include "base/test/test_suite.h"
 
 int main(int argc, char **argv) {
-  return content::UnitTestTestSuite(new DeviceTestSuite(argc, argv)).Run();
+  return base::TestSuite(argc, argv).Run();
 }