Move test headers from content\test to content\public\test. This way we can enforce that internal c…

ash/test/test_shell_delegate.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 "ash/test/test_shell_delegate.h"
 
 #include <algorithm>
 
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/test_launcher_delegate.h"
-#include "content/test/test_browser_context.h"
+#include "content/public/test/test_browser_context.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate() : locked_(false) {
 }
 
 TestShellDelegate::~TestShellDelegate() {
@@ skipping 42 matching lines @@
 void TestShellDelegate::RestoreTab() {
 }
 
 void TestShellDelegate::ShowKeyboardOverlay() {
 }
 
 void TestShellDelegate::ShowTaskManager() {
 }
 
 content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() {
-  return new TestBrowserContext();
+  return new content::TestBrowserContext();
 }
 
 void TestShellDelegate::ToggleSpokenFeedback() {
 }
 
 app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
   return NULL;
 }
 
 void TestShellDelegate::StartPartialScreenshot(
@@ skipping 15 matching lines @@
 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
   return NULL;
 }
 
 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
   return NULL;
 }
 
 }  // namespace test
 }  // namespace ash