summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/cocoa/browser_test_helper.h2
-rw-r--r--chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc2
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc2
-rw-r--r--chrome/browser/ui/views/bookmark_bar_view_unittest.cc2
-rw-r--r--chrome/browser/ui/views/bookmark_context_menu_test.cc4
-rw-r--r--chrome/browser/ui/views/bookmark_editor_view_unittest.cc2
-rw-r--r--chrome/browser/ui/webui/theme_source_unittest.cc2
8 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/ui/cocoa/browser_test_helper.h b/chrome/browser/ui/cocoa/browser_test_helper.h
index e03b584..ce669ed 100644
--- a/chrome/browser/ui/cocoa/browser_test_helper.h
+++ b/chrome/browser/ui/cocoa/browser_test_helper.h
@@ -6,9 +6,9 @@
#define CHROME_BROWSER_UI_COCOA_BROWSER_TEST_HELPER_H_
#pragma once
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
// Base class which contains a valid Browser*. Lots of boilerplate to
// recycle between unit test classes.
diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm
index a35acee9..b0cbed5 100644
--- a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm
@@ -5,10 +5,10 @@
#import <Cocoa/Cocoa.h>
#include "base/ref_counted.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/bug_report_window_controller.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/test_tab_contents.h"
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 12be6d9..0d05b28 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -7,9 +7,9 @@
#include "base/task.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/ui/gtk/tabstrip_origin_provider.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
// Dummy implementation that's good enough for the tests; we don't test
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index 356fa25..912bdba 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -9,10 +9,10 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::Time;
diff --git a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmark_bar_view_unittest.cc
index 42181e2..f572981 100644
--- a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmark_bar_view_unittest.cc
@@ -4,10 +4,10 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/ui/views/bookmark_bar_view.h"
#include "chrome/test/browser_with_test_window_test.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
class BookmarkBarViewTest : public BrowserWithTestWindowTest {
public:
diff --git a/chrome/browser/ui/views/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmark_context_menu_test.cc
index 9fa9a26..f50df3b 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmark_context_menu_test.cc
@@ -10,11 +10,11 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/page_navigator.h"
#include "chrome/browser/ui/views/bookmark_context_menu.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/tab_contents/page_navigator.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmark_editor_view_unittest.cc
index 11c64c9..929515e 100644
--- a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmark_editor_view_unittest.cc
@@ -8,10 +8,10 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/views/bookmark_editor_view.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::Time;
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc
index 9c1a132..959decd 100644
--- a/chrome/browser/ui/webui/theme_source_unittest.cc
+++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -3,12 +3,12 @@
// found in the LICENSE file.
#include "base/ref_counted_memory.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/browser/ui/webui/theme_source.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "grit/theme_resources.h"
#include "testing/gtest/include/gtest/gtest.h"