summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/web_contents_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 20:11:52 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 20:11:52 +0000
commit1bda9755b57f7d0a9ee5621eaa2e1a96738f7d4c (patch)
tree78da616961fbbd1e6c71cc9189c924c467941f05 /chrome/browser/tab_contents/web_contents_unittest.cc
parentbb546b3bf971a17fe59d644d0759793f781008f5 (diff)
downloadchromium_src-1bda9755b57f7d0a9ee5621eaa2e1a96738f7d4c.zip
chromium_src-1bda9755b57f7d0a9ee5621eaa2e1a96738f7d4c.tar.gz
chromium_src-1bda9755b57f7d0a9ee5621eaa2e1a96738f7d4c.tar.bz2
Update a bunch of files to the new location of browser_thread.h
TBR=avi Review URL: http://codereview.chromium.org/6594084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/web_contents_unittest.cc')
-rw-r--r--chrome/browser/tab_contents/web_contents_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 660d8b1..ca05179 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/common/chrome_paths.h"
@@ -16,6 +15,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/testing_pref_service.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/renderer_host/test_render_view_host.h"
@@ -1623,7 +1623,7 @@ TEST_F(TabContentsTest, CopyStateFromAndPruneTargetInterstitial) {
class ConstrainedWindowCloseTest : public ConstrainedWindow {
public:
- ConstrainedWindowCloseTest(TabContents* tab_contents)
+ explicit ConstrainedWindowCloseTest(TabContents* tab_contents)
: tab_contents_(tab_contents) {
}