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

chrome/browser/chromeos/extensions/external_filesystem_apitest.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 "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 #include "chrome/browser/chromeos/gdata/mock_gdata_documents_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
 using ::testing::_;
 using ::testing::Return;
 using content::BrowserContext;
 
 namespace {
 
@@ skipping 35 matching lines @@
   // (instead of calling chrome.test.succeed in js).
   void WaitUntilLoaded() {
     page_created_.Wait();
   }
 
   void WaitUntilClosed() {
     page_closed_.Wait();
   }
 
  private:
-  ui_test_utils::WindowedNotificationObserver page_created_;
-  ui_test_utils::WindowedNotificationObserver page_closed_;
+  content::WindowedNotificationObserver page_created_;
+  content::WindowedNotificationObserver page_closed_;
 };
 
 // TODO(tbarzic): We should probably share GetTestFilePath and LoadJSONFile
 // with gdata_file_system_unittest.
 // Generates file path in gdata test directory for a file with name |filename|.
 FilePath GetTestFilePath(const FilePath::StringType& filename) {
   FilePath path;
   std::string error;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
    path = path.AppendASCII("chromeos")
@@ skipping 256 matching lines @@
   EXPECT_CALL(*mock_documents_service_, CancelAll());
   // This one is called on exit, but we don't care much about it, as long as it
   // retunrs something valid (i.e. not NULL).
   EXPECT_CALL(*mock_documents_service_, operation_registry()).
       WillRepeatedly(Return(operation_registry_.get()));
 
   // All is set... RUN THE TEST.
   EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
       kComponentFlags)) << message_;
 }