Revert of Expose camera settings to the extensions.

chrome/browser/extensions/api/content_settings/content_settings_apitest.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/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
@@ skipping 98 matching lines @@
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url,
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_MOUSELOCK,
                                      std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url,
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
                                      std::string()));
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              map->GetContentSetting(example_url,
-                                     example_url,
-                                     CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
-                                     std::string()));
 
     // Check content settings for www.google.com
     GURL url("http://www.google.com");
     EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
     EXPECT_EQ(
         CONTENT_SETTING_BLOCK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
-    EXPECT_EQ(CONTENT_SETTING_BLOCK,
-        map->GetContentSetting(
-            url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
   }
 
   void CheckContentSettingsDefault() {
     HostContentSettingsMap* map =
         profile_->GetHostContentSettingsMap();
     CookieSettings* cookie_settings =
         CookieSettings::Factory::GetForProfile(profile_).get();
 
     // Check content settings for www.google.com
     GURL url("http://www.google.com");
@@ skipping 18 matching lines @@
     EXPECT_EQ(
         CONTENT_SETTING_ASK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
         map->GetContentSetting(
             url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-        map->GetContentSetting(
-            url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
   }
 
  private:
   Profile* profile_;
 };
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_Standard DISABLED_Standard
 #else
@@ skipping 44 matching lines @@
                            base::FilePath(kBarPath),
                            base::ASCIIToUTF16("2.3.4"),
                            base::ASCIIToUTF16("bar")),
       false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 }
 
 }  // namespace extensions