diff options
-rw-r--r-- | chrome/browser/ui/webui/ntp/most_visited_browsertest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/settings_browsertest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.cc (renamed from content/browser/webui/web_ui_bidi_checker_browsertest.cc) | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.h (renamed from content/browser/webui/web_ui_bidi_checker_browsertest.h) | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_browsertest.cc (renamed from content/browser/webui/web_ui_browsertest.cc) | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_browsertest.h (renamed from content/browser/webui/web_ui_browsertest.h) | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_test_handler.cc (renamed from content/browser/webui/web_ui_test_handler.cc) | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/web_ui_test_handler.h (renamed from content/browser/webui/web_ui_test_handler.h) | 0 | ||||
-rw-r--r-- | chrome/chrome_tests.gypi | 12 |
9 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 2750c89..2523fc6 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc @@ -4,10 +4,10 @@ #include "base/command_line.h" #include "base/file_path.h" +#include "chrome/browser/ui/webui/web_ui_browsertest.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" -#include "content/browser/webui/web_ui_browsertest.h" #include "googleurl/src/gurl.h" class MostVisitedWebUITest : public WebUIBrowserTest { diff --git a/chrome/browser/ui/webui/settings_browsertest.cc b/chrome/browser/ui/webui/settings_browsertest.cc index 2c65431..9dcb7e1 100644 --- a/chrome/browser/ui/webui/settings_browsertest.cc +++ b/chrome/browser/ui/webui/settings_browsertest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/options/core_options_handler.h" +#include "chrome/browser/ui/webui/web_ui_browsertest.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" -#include "content/browser/webui/web_ui_browsertest.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/webui/web_ui_bidi_checker_browsertest.cc b/chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.cc index 938a5a5..f3857d9 100644 --- a/content/browser/webui/web_ui_bidi_checker_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.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/browser/webui/web_ui_bidi_checker_browsertest.h" +#include "chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.h" #include "base/base_paths.h" #include "base/path_service.h" diff --git a/content/browser/webui/web_ui_bidi_checker_browsertest.h b/chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.h index 529294e..90987ae 100644 --- a/content/browser/webui/web_ui_bidi_checker_browsertest.h +++ b/chrome/browser/ui/webui/web_ui_bidi_checker_browsertest.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_WEBUI_WEB_UI_BIDI_CHECKER_BROWSERTEST_H_ #pragma once -#include "content/browser/webui/web_ui_browsertest.h" +#include "chrome/browser/ui/webui/web_ui_browsertest.h" #include "chrome/test/in_process_browser_test.h" // Base class for BidiChecker-based tests. Preloads the BidiChecker JS library diff --git a/content/browser/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc index 36c9cc7..026c77d 100644 --- a/content/browser/webui/web_ui_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_browsertest.cc @@ -1,7 +1,7 @@ // Copyright (c) 2011 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 "content/browser/webui/web_ui_browsertest.h" +#include "chrome/browser/ui/webui/web_ui_browsertest.h" #include <string> #include <vector> diff --git a/content/browser/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h index 2e7ffc2..001ae7a 100644 --- a/content/browser/webui/web_ui_browsertest.h +++ b/chrome/browser/ui/webui/web_ui_browsertest.h @@ -9,8 +9,8 @@ #include <string> #include "base/file_path.h" +#include "chrome/browser/ui/webui/web_ui_test_handler.h" #include "chrome/test/in_process_browser_test.h" -#include "content/browser/webui/web_ui_test_handler.h" class Value; class WebUIMessageHandler; diff --git a/content/browser/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc index 280774f..29eb98c 100644 --- a/content/browser/webui/web_ui_test_handler.cc +++ b/chrome/browser/ui/webui/web_ui_test_handler.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/browser/webui/web_ui_test_handler.h" +#include "chrome/browser/ui/webui/web_ui_test_handler.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/content/browser/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h index b0135d2..b0135d2 100644 --- a/content/browser/webui/web_ui_test_handler.h +++ b/chrome/browser/ui/webui/web_ui_test_handler.h diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3285adb..9d4b61d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2372,6 +2372,12 @@ 'browser/ui/webui/mediaplayer_browsertest.cc', 'browser/ui/webui/ntp/most_visited_browsertest.cc', 'browser/ui/webui/settings_browsertest.cc', + 'browser/ui/webui/web_ui_bidi_checker_browsertest.cc', + 'browser/ui/webui/web_ui_bidi_checker_browsertest.h', + 'browser/ui/webui/web_ui_browsertest.cc', + 'browser/ui/webui/web_ui_browsertest.h', + 'browser/ui/webui/web_ui_test_handler.cc', + 'browser/ui/webui/web_ui_test_handler.h', 'renderer/autofill/autofill_browsertest.cc', 'renderer/autofill/form_autocomplete_browsertest.cc', 'renderer/autofill/form_manager_browsertest.cc', @@ -2404,12 +2410,6 @@ '../content/browser/renderer_host/render_view_host_browsertest.cc', '../content/browser/renderer_host/render_view_host_manager_browsertest.cc', '../content/browser/speech/speech_input_browsertest.cc', - '../content/browser/webui/web_ui_bidi_checker_browsertest.cc', - '../content/browser/webui/web_ui_bidi_checker_browsertest.h', - '../content/browser/webui/web_ui_browsertest.cc', - '../content/browser/webui/web_ui_browsertest.h', - '../content/browser/webui/web_ui_test_handler.cc', - '../content/browser/webui/web_ui_test_handler.h', '../content/renderer/render_view_browsertest.cc', '../content/renderer/render_view_browsertest_mac.mm', '../content/renderer/render_widget_browsertest.cc', |