Move options_util.* into chrome/browser/metrics.

chrome/browser/ui/webui/options/core_options_handler.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 "chrome/browser/ui/webui/options/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
+#include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/options/options_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 14 matching lines @@
 
 // Only allow changes to the metrics reporting checkbox if we were succesfully
 // able to change the service.
 bool AllowMetricsReportingChange(const base::Value* to_value) {
   bool enable;
   if (!to_value->GetAsBoolean(&enable)) {
     NOTREACHED();
     return false;
   }
 
-  return enable == OptionsUtil::ResolveMetricsReportingEnabled(enable);
+  return enable == ResolveMetricsReportingEnabled(enable);
 }
 
 // Whether "controlledBy" property of pref value sent to options web UI needs to
 // be set to "extension" when the preference is controlled by an extension.
 bool CanSetExtensionControlledPrefValue(
     const PrefService::Preference* preference) {
 #if defined(OS_WIN)
   // These have more obvious UI than the standard one for extension controlled
   // values (an extension puzzle piece) on the settings page. To avoiding
   // showing the extension puzzle piece for these settings, their "controlledBy"
@@ skipping 585 matching lines @@
 }
 
 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
   base::FundamentalValue enabled(
           plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
   web_ui()->CallJavascriptFunction(
       "OptionsPage.setPepperFlashSettingsEnabled", enabled);
 }
 
 }  // namespace options