Promote chrome app window frame color to stable.

chrome/browser/apps/app_window_browsertest.cc

 // Copyright 2013 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 "apps/app_window_geometry_cache.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
@@ skipping 231 matching lines @@
   ASSERT_TRUE(
       RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_;
 }
 
 // TODO(benwells): Implement on Mac.
 #if defined(USE_AURA)
 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
   ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
 }
 
+// TODO(benwells): Remove this test once all the things are merged together.

[Matt Giuca, 2014/05/08 04:30:15]

nit: Can you just extend this comment to say that this used to behave
differently on stable/dev, so we now want to test that stable behaves the same
as dev.

[benwells, 2014/05/08 07:35:09]

Done.

 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) {
   extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
-  ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_;
+  ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
 }
 #endif