summaryrefslogtreecommitdiffstats
path: root/extensions/browser/guest_view
diff options
context:
space:
mode:
authortommi <tommi@chromium.org>2015-11-11 02:13:13 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-11 10:14:10 +0000
commit169f5e3e4e9a0e0b1daa79d951ba18a7b1bb0c9a (patch)
tree02b3f4d1e918852e9d2fafafd9711520e62dae34 /extensions/browser/guest_view
parent177e526d4485af3ccc9b2a32e4a75be531120ecc (diff)
downloadchromium_src-169f5e3e4e9a0e0b1daa79d951ba18a7b1bb0c9a.zip
chromium_src-169f5e3e4e9a0e0b1daa79d951ba18a7b1bb0c9a.tar.gz
chromium_src-169f5e3e4e9a0e0b1daa79d951ba18a7b1bb0c9a.tar.bz2
Revert of [ExtensionView] Add extension id whitelisting for ExtensionView. (patchset #3 id:100001 of https://codereview.chromium.org/1419143009/ )
Reason for revert: Reverting due to global variable (sizes regression). Original issue's description: > [ExtensionView] Add extension id whitelisting for ExtensionView. > > Per discussion with Chrome Eng Review, all extension ids that can be loaded by ExtensionView will be explicitly whitelisted in extension_view_whitelist.cc/h. > > This change whitelists the extension id used in browser tests, as well extension ids related to Media Router. > > This also removes some old logging and simplifies the test skeleton extensions. > > BUG=552207, 552208 > > Committed: https://crrev.com/47fa637f50f0bbf984b14b8dacbf8ed66e552091 > Cr-Commit-Position: refs/heads/master@{#359053} TBR=brettw@chromium.org,apacible@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=552207, 552208 Review URL: https://codereview.chromium.org/1434913002 Cr-Commit-Position: refs/heads/master@{#359077}
Diffstat (limited to 'extensions/browser/guest_view')
-rw-r--r--extensions/browser/guest_view/extension_view/extension_view_guest.cc4
-rw-r--r--extensions/browser/guest_view/extension_view/whitelist/OWNERS11
-rw-r--r--extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.cc42
-rw-r--r--extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h17
4 files changed, 1 insertions, 73 deletions
diff --git a/extensions/browser/guest_view/extension_view/extension_view_guest.cc b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
index 0a341ff..e000d6e 100644
--- a/extensions/browser/guest_view/extension_view/extension_view_guest.cc
+++ b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
@@ -11,7 +11,6 @@
#include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/bad_message.h"
#include "extensions/browser/guest_view/extension_view/extension_view_constants.h"
-#include "extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_messages.h"
#include "extensions/strings/grit/extensions_strings.h"
@@ -72,8 +71,7 @@ void ExtensionViewGuest::CreateWebContents(
std::string extension_id;
create_params.GetString(extensionview::kAttributeExtension, &extension_id);
- if (!crx_file::id_util::IdIsValid(extension_id) ||
- !IsExtensionIdWhitelisted(extension_id)) {
+ if (!crx_file::id_util::IdIsValid(extension_id)) {
callback.Run(nullptr);
return;
}
diff --git a/extensions/browser/guest_view/extension_view/whitelist/OWNERS b/extensions/browser/guest_view/extension_view/whitelist/OWNERS
deleted file mode 100644
index 4b00898..0000000
--- a/extensions/browser/guest_view/extension_view/whitelist/OWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-# Whitelisting new extension ids for ExtensionView use requires approval from
-# chrome-eng-review@google.com.
-set noparent
-
-ben@chromium.org
-brettw@chromium.org
-cpu@chromium.org
-darin@chromium.org
-dglazkov@chromium.org
-jam@chromium.org
-jochen@chromium.org \ No newline at end of file
diff --git a/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.cc b/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.cc
deleted file mode 100644
index dbd9c11..0000000
--- a/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 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 "extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h"
-
-#include "base/logging.h"
-#include "base/macros.h"
-
-namespace extensions {
-
-namespace {
-
-// =============================================================================
-//
-// ADDING NEW EXTENSIONS REQUIRES APPROVAL from chrome-eng-review@google.com
-//
-// =============================================================================
-
-const std::string kWhitelist[] = {
- "pemeknaakobkocgmimdeamlcklioagkh", // Used in browser tests
- "dppcjffonoklmpdmljnpdojmoaefcabf", // Used in browser tests
- "fjhoaacokmgbjemoflkofnenfaiekifl", // http://crbug.com/552208
- "ekpaaapppgpmolpcldedioblbkmijaca", // http://crbug.com/552208
- "lhkfccafpkdlaodkicmokbmfapjadkij", // http://crbug.com/552208
- "ibiljbkambkbohapfhoonkcpcikdglop", // http://crbug.com/552208
- "enhhojjnijigcajfphajepfemndkmdlo", // http://crbug.com/552208
-};
-
-} // namespace
-
-// static
-bool IsExtensionIdWhitelisted(const std::string& extension_id) {
- for (size_t i = 0; i < arraysize(kWhitelist); ++i) {
- if (extension_id == kWhitelist[i])
- return true;
- }
-
- return false;
-}
-
-} // namespace extensions
diff --git a/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h b/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h
deleted file mode 100644
index 512600b..0000000
--- a/extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 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.
-
-#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_EXTENSION_VIEW_WHITELIST_EXTENSION_VIEW_WHITELIST_H_
-#define EXTENSIONS_BROWSER_GUEST_VIEW_EXTENSION_VIEW_WHITELIST_EXTENSION_VIEW_WHITELIST_H_
-
-#include <string>
-
-namespace extensions {
-
-// Checks whether |extension_id| is whitelisted to be used by ExtensionView.
-bool IsExtensionIdWhitelisted(const std::string& extension_id);
-
-} // namespace extensions
-
-#endif // EXTENSIONS_BROWSER_GUEST_VIEW_EXTENSION_VIEW_WHITELIST_EXTENSION_VIEW_WHITELIST_H_