Add perf tests target to components.

NOTE: This does not run on perf test bots yet.

BUG=138280
TEST=components_perftests
R=boliu@chromium.org,kaiwang@chromium.org,joi@chromium.org,sky@chromium.org


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

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

2 files changed, 32 insertions, 10 deletions

diff --git a/components/components_tests.gypi b/components/components_tests.gypi
index 158a92b..7695f76 100644
--- a/components/components_tests.gypi
+++ b/components/components_tests.gypi
@@ -55,7 +55,34 @@
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
-        }
+        },
+        {
+          'target_name': 'components_perftests',
+          'type': '<(gtest_target_type)',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_perf',
+            '../content/content.gyp:test_support_content',
+            '../testing/gtest.gyp:gtest',
+            '../ui/compositor/compositor.gyp:compositor',
+            'visitedlink_browser',
+          ],
+         'include_dirs': [
+           '..',
+         ],
+         'sources': [
+           'visitedlink/test/visitedlink_perftest.cc',
+         ],
+         'conditions': [
+           ['OS == "android" and gtest_target_type == "shared_library"', {
+             'dependencies': [
+               '../testing/android/native_test.gyp:native_test_native_code',
+             ],
+           }],
+         ],
+         # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+         'msvs_disabled_warnings': [ 4267, ],
+        },
       ],
       'conditions': [
         ['OS == "android" and gtest_target_type == "shared_library"', {
diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc
index c9577f1..521cc64 100644
--- a/components/visitedlink/test/visitedlink_perftest.cc
+++ b/components/visitedlink/test/visitedlink_perftest.cc
@@ -40,11 +40,6 @@ class DummyVisitedLinkEventListener : public VisitedLinkMaster::Listener {
   virtual void NewTable(base::SharedMemory* table) OVERRIDE {}
   virtual void Add(VisitedLinkCommon::Fingerprint) OVERRIDE {}
   virtual void Reset() OVERRIDE {}
-
-  static DummyVisitedLinkEventListener* GetInstance() {
-    static DummyVisitedLinkEventListener instance;
-    return &instance;
-  }
 };
 
 
@@ -84,7 +79,7 @@ class VisitedLink : public testing::Test {
 // useful to make another set of tests to test these things in isolation.
 TEST_F(VisitedLink, TestAddAndQuery) {
   // init
-  VisitedLinkMaster master(DummyVisitedLinkEventListener::GetInstance(),
+  VisitedLinkMaster master(new DummyVisitedLinkEventListener(),
                            NULL, true, true, db_path_, 0);
   ASSERT_TRUE(master.Init());
 
@@ -115,7 +110,7 @@ TEST_F(VisitedLink, TestLoad) {
   {
     PerfTimeLogger table_initialization_timer("Table_initialization");
 
-    VisitedLinkMaster master(DummyVisitedLinkEventListener::GetInstance(),
+    VisitedLinkMaster master(new DummyVisitedLinkEventListener(),
                              NULL, true, true, db_path_, 0);
 
     // time init with empty table
@@ -153,7 +148,7 @@ TEST_F(VisitedLink, TestLoad) {
     {
       PerfTimer cold_timer;
 
-      VisitedLinkMaster master(DummyVisitedLinkEventListener::GetInstance(),
+      VisitedLinkMaster master(new DummyVisitedLinkEventListener(),
                                NULL,
                                true,
                                true,
@@ -170,7 +165,7 @@ TEST_F(VisitedLink, TestLoad) {
     {
       PerfTimer hot_timer;
 
-      VisitedLinkMaster master(DummyVisitedLinkEventListener::GetInstance(),
+      VisitedLinkMaster master(new DummyVisitedLinkEventListener(),
                                NULL,
                                true,
                                true,