summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 20:59:12 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 20:59:12 +0000
commitd62d0e5c0c70049c772b87afda067171008cb1e6 (patch)
treeb6e6e3b41a0a8d601cc3d37973e07cddedf75e27
parentacbeb3d6a2bc239b29170629adf8fc217822a0d2 (diff)
downloadchromium_src-d62d0e5c0c70049c772b87afda067171008cb1e6.zip
chromium_src-d62d0e5c0c70049c772b87afda067171008cb1e6.tar.gz
chromium_src-d62d0e5c0c70049c772b87afda067171008cb1e6.tar.bz2
Revert 76418 - Remove chrome\browser\browser_thread.h
TBR=avi Review URL: http://codereview.chromium.org/6602046 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/6598075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76420 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_thread.h12
-rw-r--r--chrome/browser/extensions/user_script_master_unittest.cc2
-rw-r--r--chrome/browser/sync/abstract_profile_sync_service_test.h2
3 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/browser_thread.h b/chrome/browser/browser_thread.h
new file mode 100644
index 0000000..1a796dd
--- /dev/null
+++ b/chrome/browser/browser_thread.h
@@ -0,0 +1,12 @@
+// Copyright (c) 2010 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.
+
+#ifndef CHROME_BROWSER_BROWSER_THREAD_H_
+#define CHROME_BROWSER_BROWSER_THREAD_H_
+#pragma once
+
+// TODO(jam): remove this file when all files have been converted.
+#include "content/browser/browser_thread.h"
+
+#endif // CHROME_BROWSER_BROWSER_THREAD_H_
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index 0468b73..c01302a 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -11,10 +11,10 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "chrome/browser/browser_thread.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_service.h"
#include "chrome/test/testing_profile.h"
-#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
// Test bringing up a master on a specific directory, putting a script
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h
index 8f8cbbe..8e67378 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.h
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.h
@@ -11,10 +11,10 @@
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
+#include "chrome/browser/browser_thread.h"
#include "chrome/browser/net/gaia/token_service.h"
#include "chrome/browser/sync/profile_sync_factory_mock.h"
#include "chrome/browser/sync/syncable/model_type.h"
-#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
class ProfileSyncService;