Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/browser_theme_pack_unittest.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/themes/browser_theme_pack.h"
 
 #include <stddef.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 230 matching lines @@
     // they're included in the theme pack, they were autogenerated and
     // therefore shouldn't show up when calling HasCustomImage().
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
 #if !defined(OS_MACOSX)
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO));
 #endif
 
     // Make sure we don't have phantom data.
-    EXPECT_FALSE(pack->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND,
-                                &color));
     EXPECT_FALSE(pack->GetTint(ThemeProperties::TINT_FRAME, &actual));
   }
 
   void VerifyHiDpiTheme(BrowserThemePack* pack) {
     // The high DPI theme defines the following images:
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_TOOLBAR));
@@ skipping 387 matching lines @@
   }
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(file, "gllekhaobjnhgeag");
     ASSERT_TRUE(pack.get());
     VerifyHiDpiTheme(pack.get());
   }
 }