Make views::Label and views::Link auto-color themselves to be readable over their background colo...

chrome/browser/search_engines/template_url_fetcher_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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 11 matching lines @@
 
 // Handles callbacks from TemplateURLFetcher.
 class TemplateURLFetcherTestCallbacks : public TemplateURLFetcherCallbacks {
  public:
   explicit TemplateURLFetcherTestCallbacks(TemplateURLFetcherTest* test)
       : test_(test) {
   }
   virtual ~TemplateURLFetcherTestCallbacks();
 
   // TemplateURLFetcherCallbacks implementation.
-  virtual void ConfirmSetDefaultSearchProvider(
-      TemplateURL* template_url,
-      TemplateURLService* template_url_service);
-  virtual void ConfirmAddSearchProvider(
-      TemplateURL* template_url,
-      Profile* profile);
+  virtual void ConfirmSetDefaultSearchProvider(TemplateURL* template_url,
+                                               Profile* profile);

[sky, 2011/10/11 14:54:10]

Since you're touching this code, how about adding OVERRIDE

+  virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
+                                        Profile* profile);
 
  private:
   TemplateURLFetcherTest* test_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLFetcherTestCallbacks);
 };
 
 // Basic set-up for TemplateURLFetcher tests.
 class TemplateURLFetcherTest : public testing::Test {
  public:
@@ skipping 13 matching lines @@
 
   virtual void TearDown() {
     test_util_.TearDown();
   }
 
   // Called by ~TemplateURLFetcherTestCallbacks.
   void DestroyedCallback(TemplateURLFetcherTestCallbacks* callbacks);
 
   // TemplateURLFetcherCallbacks implementation.  (Although not derived from
   // this class, these methods handle those calls for the test.)
-  virtual void ConfirmSetDefaultSearchProvider(
-      TemplateURL* template_url,
-      TemplateURLService* template_url_service);
-  virtual void ConfirmAddSearchProvider(
-      TemplateURL* template_url,
-      Profile* profile);
+  virtual void ConfirmSetDefaultSearchProvider(TemplateURL* template_url,
+                                               Profile* profile);
+  virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
+                                        Profile* profile);
 
  protected:
   // Schedules the download of the url.
   void StartDownload(const string16& keyword,
                      const std::string& osdd_file_name,
                      TemplateURLFetcher::ProviderType provider_type,
                      bool check_that_file_exists);
 
   // Waits for any downloads to finish.
   void WaitForDownloadToFinish();
@@ skipping 20 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(TemplateURLFetcherTest);
 };
 
 TemplateURLFetcherTestCallbacks::~TemplateURLFetcherTestCallbacks() {
   test_->DestroyedCallback(this);
 }
 
 void TemplateURLFetcherTestCallbacks::ConfirmSetDefaultSearchProvider(
     TemplateURL* template_url,
-    TemplateURLService* template_url_service) {
-  test_->ConfirmSetDefaultSearchProvider(template_url, template_url_service);
+    Profile* profile) {
+  test_->ConfirmSetDefaultSearchProvider(template_url, profile);
 }
 
 void TemplateURLFetcherTestCallbacks::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
   test_->ConfirmAddSearchProvider(template_url, profile);
 }
 
 TemplateURLFetcherTest::TemplateURLFetcherTest()
     : test_server_(net::TestServer::TYPE_HTTP,
                    FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
       callbacks_destroyed_(0),
       set_default_called_(0),
       add_provider_called_(0),
       waiting_for_download_(false) {
 }
 
 void TemplateURLFetcherTest::DestroyedCallback(
     TemplateURLFetcherTestCallbacks* callbacks) {
   callbacks_destroyed_++;
   if (waiting_for_download_)
     MessageLoop::current()->Quit();
 }
 
 void TemplateURLFetcherTest::ConfirmSetDefaultSearchProvider(
     TemplateURL* template_url,
-    TemplateURLService* template_url_service) {
+    Profile* profile) {
   last_callback_template_url_.reset(template_url);
   set_default_called_++;
 }
 
 void TemplateURLFetcherTest::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
   last_callback_template_url_.reset(template_url);
   add_provider_called_++;
 }
@@ skipping 225 matching lines @@
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(2, callbacks_destroyed_);
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, set_default_called_);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(3, callbacks_destroyed_);
   ASSERT_TRUE(last_callback_template_url_.get());
   ASSERT_NE(keyword, last_callback_template_url_->keyword());
 }