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

chrome/browser/ui/cocoa/menu_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/menu_controller.h"
 #include "grit/generated_resources.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 class MenuControllerTest : public CocoaTest {
 };
 
@@ skipping 303 matching lines @@
   EXPECT_FALSE(delegate.did_close_);
 
   // Pump the task that notifies the delegate.
   message_loop.RunAllPending();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace