ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

 // Copyright (c) 2011 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/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
@@ skipping 35 matching lines @@
   int setting_value;
   ASSERT_TRUE(one_origin_settings->GetIntegerWithoutPathExpansion(
       std::string(secondary_origin.spec()), &setting_value));
   EXPECT_EQ(expected_setting, setting_value);
 }
 
 }  // namespace
 
 namespace content_settings {
 
-bool SettingsEqual(const ContentSettings& settings1,
-                   const ContentSettings& settings2) {
-  for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
-    if (settings1.settings[i] != settings2.settings[i])
-      return false;
-  }
-  return true;
-}
-
 class DeadlockCheckerThread : public base::PlatformThread::Delegate {
  public:
   explicit DeadlockCheckerThread(PrefProvider* provider)
       : provider_(provider) {}
 
   virtual void ThreadMain() {
     bool got_lock = provider_->lock_.Try();
     EXPECT_TRUE(got_lock);
     if (got_lock)
       provider_->lock_.Release();
@@ skipping 796 matching lines @@
     DictionaryValue* mutable_settings = update.Get();
     mutable_settings->SetWithoutPathExpansion("www.example.com,*",
                                               new base::DictionaryValue());
   }
   EXPECT_TRUE(observer.notification_received());
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings