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

chrome/browser/ui/media_stream_infobar_delegate.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/ui/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "googleurl/src/gurl.h"
-#include "grit/theme_resources_standard.h"
+#include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
     InfoBarTabHelper* tab_helper,
     MediaStreamDevicesController* controller)
     : InfoBarDelegate(tab_helper),
       controller_(controller) {
   DCHECK(controller_.get());
 }
 
@@ skipping 46 matching lines @@
 }
 
 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 MediaStreamInfoBarDelegate*
     MediaStreamInfoBarDelegate::AsMediaStreamInfoBarDelegate() {
   return this;
 }