Update "Predict network actions" UI setting.

chrome/browser/policy/policy_prefs_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 <algorithm>
 #include <cstdlib>
 #include <map>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/external_data_manager.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_details.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/schema.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 672 matching lines @@
             continue;
           }
 
           PrefService* prefs =
               (*pref_mapping)->is_local_state() ? local_state : user_prefs;
           // The preference must have been registered.
           const PrefService::Preference* pref =
               prefs->FindPreference((*pref_mapping)->pref().c_str());
           ASSERT_TRUE(pref);
 
+          // This hack is necessary because
+          // BrowserOptionsHandler::MigrateNetworkPredictionOptions migrates the
+          // deprecated kNetworkPredicitonEnabled preference into
+          // kNetworkPredictionOptions, setting a user value.

[bartfab (slow), 2014/08/04 16:44:13]

User values should be set by the user. The migration you described sounds
dangerous. It means that policy-supplied values end up getting stored as if they
had been set by the user. Here are some of the problems that can lead to:

* Any controlled setting indicator keyed by the pref will not show up the
enterprise icon, because the value will look like it was set by the user, not by
policy.
* The user will be able to change the policy-supplied value.
* How about the following scenario: The admin sets the policy to a value now,
the migration code copies this to a user value. Later, after the migration code
has been removed, the admin unsets the policy value. Since there is no migration
code anymore, the value that had been copied stays.

[Bence, 2014/08/04 20:35:32]

Done.

+          // TODO(bnc): https://crbug.com/334602  Remove this hack once
+          // migration code is removed.
+          if ((*pref_mapping)->pref().compare(
+                  prefs::kNetworkPredictionOptions) == 0) {
+            prefs->ClearPref((*pref_mapping)->pref().c_str());
+          }
+
           // Check that the appropriate controlled setting indicator is shown
           // when a value is recommended by policy and the user has not
           // overridden the recommendation.
           SetProviderPolicy((*indicator_test_case)->policy(),
                             POLICY_LEVEL_RECOMMENDED);
           VerifyControlledSettingIndicators(browser(),
                                             indicator_selector,
                                             (*indicator_test_case)->value(),
                                             "recommended",
                                             (*indicator_test_case)->readonly());
@@ skipping 11 matching lines @@
       }
     }
   }
 }
 
 INSTANTIATE_TEST_CASE_P(PolicyPrefIndicatorTestInstance,
                         PolicyPrefIndicatorTest,
                         testing::ValuesIn(SplitPoliciesIntoChunks(10)));
 
 }  // namespace policy