Reland r223124: Don't clear existing extension-defined preferences and content settings when reload…

chrome/browser/managed_mode/managed_mode_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/common/cancelable_request.h"
@@ skipping 206 matching lines @@
       managed_user_service_->GetManualBehaviorForHost("www.new-example.com"));
 
   // Query the history entry.
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       browser()->profile(), Profile::EXPLICIT_ACCESS);
   history::QueryOptions options;
   history::QueryResults results;
   QueryHistory(history_service, "", options, &results);
 
   // Check that the entries have the correct blocked_visit value.
-  EXPECT_EQ(2u, results.size());
+  ASSERT_EQ(2u, results.size());
   EXPECT_EQ(blocked_url.spec(), results[0].url().spec());
   EXPECT_TRUE(results[0].blocked_visit());
   EXPECT_EQ(allowed_url.spec(), results[1].url().spec());
   EXPECT_FALSE(results[1].blocked_visit());
 }
 
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, Unblock) {
   GURL test_url("http://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ skipping 16 matching lines @@
       managed_users::kContentPackManualBehaviorHosts, dict.PassAs<Value>());
   EXPECT_EQ(
       ManagedUserService::MANUAL_ALLOW,
       managed_user_service_->GetManualBehaviorForHost(test_url.host()));
 
   observer.Wait();
   EXPECT_EQ(test_url, web_contents->GetURL());
 }
 
 }  // namespace