Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

 // 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 <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/dump_accessibility_tree_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::OpenURLParams;
 using content::RenderViewHostImpl;
 using content::RenderWidgetHostImpl;
 using content::RenderWidgetHost;
 using content::RenderWidgetHostViewPort;
 using content::Referrer;
 
 namespace {
@@ skipping 95 matching lines @@
     RemoveChars(expected_contents_raw, "\r", &expected_contents);
 
     if (!expected_contents.compare(0, strlen(kMarkSkipFile), kMarkSkipFile)) {
       printf("Skipping %s\n", html_file.BaseName().MaybeAsASCII().c_str());
       continue;
     }
 
     printf("Testing %s\n", html_file.BaseName().MaybeAsASCII().c_str());
 
     // Load the page.
-    ui_test_utils::WindowedNotificationObserver tree_updated_observer(
+    content::WindowedNotificationObserver tree_updated_observer(
         content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
         content::NotificationService::AllSources());
     string16 html_contents16;
     html_contents16 = UTF8ToUTF16(html_contents);
     GURL url(UTF8ToUTF16(kUrlPreamble) + html_contents16);
     browser()->OpenURL(OpenURLParams(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
 
     // Wait for the tree.
     tree_updated_observer.Wait();
@@ skipping 43 matching lines @@
 
       EXPECT_TRUE(file_util::WriteFile(
           actual_file, actual_contents.c_str(), actual_contents.size()));
 
       ADD_FAILURE() << "No expectation found. Create it by doing:\n"
           << "mv " << actual_file.LossyDisplayName() << " "
           << expected_file.LossyDisplayName();
     }
   } while (!(html_file = file_enumerator.Next()).empty());
 }