Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 0c2c8ef471fd1f1bcec965843e45e84f5fb9fc0f..20e8e10f960ee136878587d3e9d8f2c7b7442e76 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -26,6 +26,7 @@
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -33,7 +34,6 @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -806,8 +806,8 @@ void ContentSettingMediaStreamBubbleModel::SetMediaMenus() {
       TabSpecificContentSettings::FromWebContents(web_contents());
   const std::string& requested_microphone =
        content_settings->media_stream_requested_audio_device();
-   const std::string& requested_camera =
-       content_settings->media_stream_requested_video_device();
+  const std::string& requested_camera =
+      content_settings->media_stream_requested_video_device();
 
   // Add microphone menu.
   PrefService* prefs = profile()->GetPrefs();
@@ -1029,7 +1029,6 @@ ContentSettingRPHBubbleModel::ContentSettingRPHBubbleModel(
       registry_(registry),
       pending_handler_(ProtocolHandler::EmptyProtocolHandler()),
       previous_handler_(ProtocolHandler::EmptyProtocolHandler()) {
-
   DCHECK_EQ(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, content_type);
 
   TabSpecificContentSettings* content_settings =