Make sure the device recovers from policy loss in the consumer case.

chrome/test/base/testing_browser_process.cc

Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 2f0ddacfc1c0541f1037ecdec14df6c523dcd031..c1c72362b20cbf9157d844f4e8bf0ef54a99a94e 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -6,6 +6,7 @@
 
 #include "base/string_util.h"
 #include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/policy_service_stub.h"
@@ -39,7 +40,7 @@ void TestingBrowserProcess::EndSession() {
 }
 
 MetricsService* TestingBrowserProcess::metrics_service() {
-  return NULL;
+  return metrics_service_.get();
 }
 
 IOThread* TestingBrowserProcess::io_thread() {
@@ -255,3 +256,7 @@ void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
   sb_service_ = sb_service;
 }
+
+void TestingBrowserProcess::SetMetricsService(MetricsService* service) {
+  metrics_service_.reset(service);
+}