summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 15:25:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 15:25:53 +0000
commit19d536f25ffa4e876c7af79b201c7330841b31ea (patch)
tree2f64619a8812920692bd3c7e69103727021e9d53 /chrome_frame
parent6c4e6631acb0893ba00f035792e80942e2b00bd3 (diff)
downloadchromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.zip
chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.gz
chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.bz2
Cleanup in base. This moves the implementation (and a bunch of header file
dependencies) from the multiprocess test and the test_suite headers to .cc files. Moves multiprocess_test to the test directory, and all of this stuff to the existing base_test_support project. I also used the base namespace. Previously other projects included this functionality just by #include because it was all inline, so I had to add dependencies on base_test_support in a few places. Moves and renames the command line switch this was using to base_switches. Move the base switch for process type to chrome switches. TEST=none BUG=none Review URL: http://codereview.chromium.org/3026055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp5
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc4
-rw-r--r--chrome_frame/test/perf/run_all.cc5
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 7d36d33..92623ab 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -115,8 +115,9 @@
'type': 'executable',
'msvs_guid': '17D98CCA-0F6A-470F-9DF9-56DC6CC1A0BE',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
- '../chrome/chrome.gyp:browser',
+ '../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:nacl',
@@ -203,6 +204,7 @@
'msvs_guid': '1D25715A-C8CE-4448-AFA3-8515AF22D235',
'type': 'executable',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
@@ -434,6 +436,7 @@
'type': 'executable',
'msvs_guid': 'A1440368-4089-4E14-8864-D84D3C5714A7',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:renderer',
'../testing/gtest.gyp:gtest',
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index e02809e..8b38d0e 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -9,14 +9,13 @@
#include "app/app_paths.h"
#include "app/resource_bundle.h"
#include "app/win_util.h"
-
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/i18n/icu_util.h"
#include "base/path_service.h"
#include "base/scoped_comptr_win.h"
-
+#include "base/string_util.h"
#include "chrome/browser/automation/automation_provider_list.h"
#include "chrome/browser/browser_prefs.h"
#include "chrome/browser/plugin_service.h"
@@ -36,6 +35,7 @@
#include "chrome_frame/test/simulate_input.h"
#include "chrome_frame/test/win_event_receiver.h"
#include "chrome_frame/test/net/test_automation_resource_message_filter.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome_frame/test/perf/run_all.cc b/chrome_frame/test/perf/run_all.cc
index a5f4738..26c6e99 100644
--- a/chrome_frame/test/perf/run_all.cc
+++ b/chrome_frame/test/perf/run_all.cc
@@ -1,6 +1,7 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/platform_thread.h"
#include "base/test/perf_test_suite.h"
#include "base/scoped_ptr.h"
@@ -10,7 +11,7 @@
#include "chrome_frame/utils.h"
int main(int argc, char **argv) {
- PerfTestSuite perf_suite(argc, argv);
+ base::PerfTestSuite perf_suite(argc, argv);
chrome::RegisterPathProvider();
PlatformThread::SetName("ChromeFrame perf tests");