Move ContentBrowserSanityChecker and WebContentsObserverSanityChecker from...

Move ContentBrowserSanityChecker and WebContentsObserverSanityChecker from content/public/test to content/test

TEST=compiles
BUG=None

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

Cr-Commit-Position: refs/heads/master@{#329958}

content/content_tests.gypi

@@ -33,8 +33,6 @@
       'public/test/browser_test_base.h',
       'public/test/browser_test_utils.cc',
       'public/test/browser_test_utils.h',
-      'public/test/content_browser_sanity_checker.cc',
-      'public/test/content_browser_sanity_checker.h',
       'public/test/content_test_suite_base.cc',
       'public/test/content_test_suite_base.h',
       'public/test/download_test_observer.cc',
@@ -102,8 +100,6 @@
       'public/test/test_web_contents_factory.h',
       'public/test/unittest_test_suite.cc',
       'public/test/unittest_test_suite.h',
-      'public/test/web_contents_observer_sanity_checker.cc',
-      'public/test/web_contents_observer_sanity_checker.h',
       'public/test/web_contents_tester.cc',
       'public/test/web_contents_tester.h',
       'test/appcache_test_helper.cc',
@@ -112,6 +108,8 @@
       'test/blink_test_environment.h',
       'test/browser_side_navigation_test_utils.cc',
       'test/browser_side_navigation_test_utils.h',
+      'test/content_browser_sanity_checker.cc',
+      'test/content_browser_sanity_checker.h',
       'test/content_browser_test_utils_internal.cc',
       'test/content_browser_test_utils_internal.h',
       'test/content_test_suite.cc',
@@ -166,6 +164,8 @@
       'test/test_web_contents.cc',
       'test/test_web_contents.h',
       'test/test_web_contents_factory.cc',
+      'test/web_contents_observer_sanity_checker.cc',
+      'test/web_contents_observer_sanity_checker.h',
       'test/web_gesture_curve_mock.cc',
       'test/web_gesture_curve_mock.h',
       'test/web_layer_tree_view_impl_for_testing.cc',
@@ -338,7 +338,7 @@
       'browser/appcache/mock_appcache_storage.h',
       'browser/appcache/mock_appcache_storage_unittest.cc',
       'browser/background_sync/background_sync_manager_unittest.cc',
-      'browser/background_sync/background_sync_network_observer_unittest.cc',      
+      'browser/background_sync/background_sync_network_observer_unittest.cc',
       'browser/browser_thread_unittest.cc',
       'browser/browser_url_handler_impl_unittest.cc',
       'browser/byte_stream_unittest.cc',

content/public/test/browser_test_base.cc

@@ -18,9 +18,9 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
-#include "content/public/test/content_browser_sanity_checker.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/test_utils.h"
+#include "content/test/content_browser_sanity_checker.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"

content/public/test/test_renderer_host.cc

@@ -13,10 +13,10 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/test/content_browser_sanity_checker.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/browser_side_navigation_test_utils.h"
+#include "content/test/content_browser_sanity_checker.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_render_frame_host_factory.h"
 #include "content/test/test_render_view_host.h"

content/public/test/content_browser_sanity_checker.cc → content/test/content_browser_sanity_checker.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/test/content_browser_sanity_checker.h"
+#include "content/test/content_browser_sanity_checker.h"
 
 #include "base/bind.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/test/web_contents_observer_sanity_checker.h"
+#include "content/test/web_contents_observer_sanity_checker.h"
 
 namespace content {
 

content/public/test/content_browser_sanity_checker.h → content/test/content_browser_sanity_checker.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 CONTENT_PUBLIC_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_
-#define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_
+#ifndef CONTENT_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_
+#define CONTENT_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -39,4 +39,4 @@ class ContentBrowserSanityChecker {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_
+#endif  // CONTENT_TEST_CONTENT_BROWSER_SANITY_CHECKER_H_

content/public/test/web_contents_observer_sanity_checker.cc → content/test/web_contents_observer_sanity_checker.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 "content/public/test/web_contents_observer_sanity_checker.h"
+#include "content/test/web_contents_observer_sanity_checker.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/common/frame_messages.h"

content/public/test/web_contents_observer_sanity_checker.h → content/test/web_contents_observer_sanity_checker.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 CONTENT_PUBLIC_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_
-#define CONTENT_PUBLIC_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_
+#ifndef CONTENT_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_
+#define CONTENT_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_
 
 #include <set>
 #include <string>
@@ -98,4 +98,4 @@ class WebContentsObserverSanityChecker : public WebContentsObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_
+#endif  // CONTENT_TEST_WEB_CONTENTS_OBSERVER_SANITY_CHECKER_H_