Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6780)

Unified Diff: chrome/browser/policy/enterprise_metrics_browsertest.cc

Issue 7552029: Revert 96098 - ui_tests began crashing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/enterprise_metrics_browsertest.cc
===================================================================
--- chrome/browser/policy/enterprise_metrics_browsertest.cc (revision 96106)
+++ chrome/browser/policy/enterprise_metrics_browsertest.cc (working copy)
@@ -22,7 +22,6 @@
#include "chrome/browser/policy/proto/device_management_local.pb.h"
#include "chrome/browser/policy/user_policy_cache.h"
#include "chrome/browser/policy/user_policy_token_cache.h"
-#include "chrome/test/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "net/url_request/url_request_status.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -114,7 +113,7 @@
// in its own process to make sure the counters are not initialized before the
// test runs, and that the StatisticsRecorder instance created for the test
// doesn't interfere with counters in other tests.
-class EnterpriseMetricsTest : public TestingBrowserProcessTest {
+class EnterpriseMetricsTest : public testing::Test {
public:
EnterpriseMetricsTest()
: ui_thread_(BrowserThread::UI, &loop_),
« no previous file with comments | « chrome/browser/password_manager/password_store_win_unittest.cc ('k') | chrome/browser/profiles/avatar_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698