Merge grd files in ui/resources and chrome/app/theme

chrome/browser/chromeos/status/network_menu_icon_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/chromeos/status/network_menu_icon.h"
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "grit/theme_resources.h"
-#include "grit/theme_resources_standard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // Compares each pixel in the 1x representation of two images for testing.
 // TODO(pkotwicz): Compare pixels of all bitmaps contained within image.
 bool CompareTwoImages(const gfx::ImageSkia& image_a,
                       const gfx::ImageSkia& image_b,
                       int log_level) {
@@ skipping 361 matching lines @@
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, wimax_connected_50_image_));
 
   // Set wifi1 to connected. Icon should now be wifi connected icon.
   SetConnected(wifi1);
   icon = menu_icon.GetIconAndText(NULL);
   EXPECT_TRUE(CompareImages(icon, wifi_connected_100_image_));
 }
 
 }  // namespace chromeos