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

chrome/browser/protector/mock_setting_change.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/protector/mock_setting_change.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/theme_resources.h"
-#include "grit/theme_resources_standard.h"
 
 using ::testing::Return;
 
 namespace protector {
 
 MockSettingChange::MockSettingChange() {
   ON_CALL(*this, GetBadgeIconID()).WillByDefault(Return(IDR_UPDATE_BADGE4));
   ON_CALL(*this, GetMenuItemIconID()).WillByDefault(Return(IDR_UPDATE_MENU4));
   ON_CALL(*this, GetBubbleIconID()).WillByDefault(Return(IDR_INPUT_ALERT));
 
@@ skipping 19 matching lines @@
 MockSettingChange::~MockSettingChange() {
 }
 
 bool MockSettingChange::Init(Profile* profile) {
   if (!BaseSettingChange::Init(profile))
     return false;
   return MockInit(profile);
 }
 
 }  // namespace protector