Move TestNotificationTracker to content as it has no dependencies to chrome but is used in content/

BUG=90443
TEST=nothing breaks

Review URL: http://codereview.chromium.org/7870002

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

8 files changed, 10 insertions, 14 deletions

diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index a8e2af5..c3222f5 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -12,12 +12,12 @@
 #include "chrome/browser/component_updater/component_updater_interceptor.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_service.h"
+#include "content/test/test_notification_tracker.h"
 
 #include "googleurl/src/gurl.h"
 #include "libxml/globals.h"
diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h
index ed2fe00..ffb9396 100644
--- a/chrome/browser/net/gaia/token_service_unittest.h
+++ b/chrome/browser/net/gaia/token_service_unittest.h
@@ -13,10 +13,10 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/test/base/signaling_task.h"
-#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
+#include "content/test/test_notification_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TestNotificationTracker doesn't do a deep copy on the notification details.
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6026795..03278f8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1823,8 +1823,6 @@
         'test/base/menu_model_test.h',
         'test/base/render_view_test.cc',
         'test/base/render_view_test.h',
-        'test/base/test_notification_tracker.cc',
-        'test/base/test_notification_tracker.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
@@ -3086,8 +3084,6 @@
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
         'test/base/out_of_proc_test_runner.cc',
-        'test/base/test_notification_tracker.cc',
-        'test/base/test_notification_tracker.h',
         'test/data/resource.rc',
         'browser/sync/test/integration/apps_helper.cc',
         'browser/sync/test/integration/apps_helper.h',
@@ -3258,8 +3254,6 @@
         'browser/sync/test/integration/typed_urls_helper.cc',
         'browser/sync/test/integration/typed_urls_helper.h',
         'test/base/out_of_proc_test_runner.cc',
-        'test/base/test_notification_tracker.cc',
-        'test/base/test_notification_tracker.h',
         'test/data/resource.rc',
       ],
       'conditions': [
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index df465a1..5d6d953 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -16,7 +16,6 @@
 //  #include "chrome/browser/sessions/session_service_factory.h"
 //  #include "chrome/browser/sessions/session_service_test_helper.h"
 //  #include "chrome/browser/sessions/session_types.h"
-#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
@@ -28,6 +27,7 @@
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/view_messages.h"
+#include "content/test/test_notification_tracker.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index aa2868a..b9ed739 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/browser_url_handler.h"
@@ -17,6 +16,7 @@
 #include "content/common/page_transition_types.h"
 #include "content/common/test_url_constants.h"
 #include "content/common/view_messages.h"
+#include "content/test/test_notification_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b05062f..92c0bcb 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -45,6 +45,8 @@
         'test/test_browser_context.h',
         'test/test_content_client.cc',
         'test/test_content_client.h',
+        'test/test_notification_tracker.cc',
+        'test/test_notification_tracker.h',
         'test/test_tab_contents_view.cc',
         'test/test_tab_contents_view.h',
         'test/test_url_fetcher_factory.cc',
diff --git a/chrome/test/base/test_notification_tracker.cc b/content/test/test_notification_tracker.cc
index 556eceb..e52ad99 100644
--- a/chrome/test/base/test_notification_tracker.cc
+++ b/content/test/test_notification_tracker.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 "chrome/test/base/test_notification_tracker.h"
+#include "content/test/test_notification_tracker.h"
 
 #include "content/common/notification_service.h"
 
diff --git a/chrome/test/base/test_notification_tracker.h b/content/test/test_notification_tracker.h
index ce18c52..8bb54d6 100644
--- a/chrome/test/base/test_notification_tracker.h
+++ b/content/test/test_notification_tracker.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 CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
-#define CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
+#ifndef CONTENT_TEST_TEST_NOTIFICATION_TRACKER_H_
+#define CONTENT_TEST_TEST_NOTIFICATION_TRACKER_H_
 #pragma once
 
 #include <vector>
@@ -79,4 +79,4 @@ class TestNotificationTracker : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(TestNotificationTracker);
 };
 
-#endif  // CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
+#endif  // CONTENT_TEST_TEST_NOTIFICATION_TRACKER_H_