Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/content_settings/tab_specific_content_settings_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 "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 208 matching lines @@
   // Request and allow camera access.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED,
+  ASSERT_EQ(static_cast<unsigned>(

[Peter Kasting, 2014/09/24 01:33:00]

Note: Following my suggestions in the header should eliminate the need for these
casts.

[robwu, 2014/09/24 23:38:44]

Done. though I had to add "| 0" in 5 places though, to solve errors like
tab_specific_content_settings_unittest.cc:216: error: undefined reference to
'TabSpecificContentSettings::MICROPHONE_ACCESSED'

[Peter Kasting, 2014/09/25 00:53:25]

This means that your constants have a declaration, but not a definition.

Instead of using | 0 in various places, add to the corresponding .cc file for
these constants:

STATIC_CONST_MEMBER_DEFINITION const Type Foo::val1;
STATIC_CONST_MEMBER_DEFINITION const Type Foo::val2;
... etc.

This provides an appropriate definition for these constants.  This shouldn't
really be needed, I don't think, unless the macros in question are actually
taking the address of their arguments, but MSVC in particular sometimes has
issues here.

[robwu, 2014/09/25 08:57:57]

The error actually showed up in GCC 4.9.1. I've put the definitions in the .cc
file as suggested instead of |0 and the linker errors went away.

+                TabSpecificContentSettings::MICROPHONE_ACCESSED |
+                TabSpecificContentSettings::CAMERA_ACCESSED),
             content_settings->GetMicrophoneCameraState());
 
   // Request and block microphone access.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
             content_settings->GetMicrophoneCameraState());
 
   // Request and block camera access.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED,
+  ASSERT_EQ(static_cast<unsigned>(
+                TabSpecificContentSettings::MICROPHONE_BLOCKED |
+                TabSpecificContentSettings::CAMERA_BLOCKED),
             content_settings->GetMicrophoneCameraState());
 
   // Request and allow microphone and camera access.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED,
+  ASSERT_EQ(static_cast<unsigned>(
+                TabSpecificContentSettings::MICROPHONE_ACCESSED |
+                TabSpecificContentSettings::CAMERA_ACCESSED),
             content_settings->GetMicrophoneCameraState());
 
   // Request and block microphone and camera access.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED,
+  ASSERT_EQ(static_cast<unsigned>(
+                TabSpecificContentSettings::MICROPHONE_ACCESSED |
+                TabSpecificContentSettings::MICROPHONE_BLOCKED |
+                TabSpecificContentSettings::CAMERA_ACCESSED |
+                TabSpecificContentSettings::CAMERA_BLOCKED),
             content_settings->GetMicrophoneCameraState());
 
   // Request microphone and camera access. Allow microphone, block camera.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentBlocked(
@@ skipping 71 matching lines @@
                                         base::UTF8ToUTF16("text"),
                                         blocked_by_policy);
   content_settings->OnLocalStorageAccessed(GURL("http://google.com"),
                                            true,
                                            blocked_by_policy);
   content_settings->OnWebDatabaseAccessed(GURL("http://google.com"),
                                           base::UTF8ToUTF16("name"),
                                           base::UTF8ToUTF16("display_name"),
                                           blocked_by_policy);
 }