Revert incognito option for external_extensions.json file

Original codereviw: http://codereview.chromium.org/3360020

BUG=http://code.google.com/p/chromium-os/issues/detail?id=6516
TEST=n/a
TBR=skerner@chromium.org

Review URL: http://codereview.chromium.org/3415022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60449 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 16 insertions, 43 deletions

diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc
index 42a19d9..f91bd07 100644
--- a/chrome/browser/extensions/extension_management_browsertest.cc
+++ b/chrome/browser/extensions/extension_management_browsertest.cc
@@ -279,7 +279,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
   // is race-prone, because instantating the ExtensionService starts a read
   // of external_extensions.json before this test function starts.
   service->AddPendingExtensionFromExternalUpdateUrl(
-      kExtensionId, GURL("http://localhost/autoupdate/manifest"), false);
+      kExtensionId, GURL("http://localhost/autoupdate/manifest"));
 
   // Run autoupdate and make sure version 2 of the extension was installed.
   service->updater()->CheckNow();
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index cfb0c2f..0057e79 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -220,10 +220,8 @@ class ExtensionsServiceBackend
                                             const FilePath& path,
                                             Extension::Location location);
 
-  virtual void OnExternalExtensionUpdateUrlFound(
-      const std::string& id,
-      const GURL& update_url,
-      bool enable_incognito_on_install);
+  virtual void OnExternalExtensionUpdateUrlFound(const std::string& id,
+                                                 const GURL& update_url);
 
   // Reloads the given extensions from their manifests on disk (instead of what
   // we have cached in the prefs).
@@ -448,15 +446,13 @@ void ExtensionsServiceBackend::OnExternalExtensionFileFound(
 
 void ExtensionsServiceBackend::OnExternalExtensionUpdateUrlFound(
     const std::string& id,
-    const GURL& update_url,
-    bool enable_incognito_on_install) {
+    const GURL& update_url) {
   if (frontend_->GetExtensionById(id, true)) {
     // Already installed.  Do not change the update URL that the extension set.
     return;
   }
 
-  frontend_->AddPendingExtensionFromExternalUpdateUrl(id, update_url,
-      enable_incognito_on_install);
+  frontend_->AddPendingExtensionFromExternalUpdateUrl(id, update_url);
   external_extension_added_ |= true;
 }
 
@@ -677,8 +673,7 @@ void ExtensionsService::AddPendingExtensionFromSync(
 }
 
 void ExtensionsService::AddPendingExtensionFromExternalUpdateUrl(
-    const std::string& id, const GURL& update_url,
-    bool enable_incognito_on_install) {
+    const std::string& id, const GURL& update_url) {
   // Add the extension to this list of extensions to update.
   // We do not know if the id refers to a theme, so make is_theme unknown.
   const PendingExtensionInfo::ExpectedCrxType kExpectedCrxType =
@@ -686,6 +681,7 @@ void ExtensionsService::AddPendingExtensionFromExternalUpdateUrl(
   const bool kIsFromSync = false;
   const bool kInstallSilently = true;
   const bool kEnableOnInstall = true;
+  const bool kEnableIncognitoOnInstall = false;
 
   if (GetExtensionByIdInternal(id, true, true)) {
     LOG(DFATAL) << "Trying to add extension " << id
@@ -695,7 +691,7 @@ void ExtensionsService::AddPendingExtensionFromExternalUpdateUrl(
 
   AddPendingExtensionInternal(id, update_url, kExpectedCrxType, kIsFromSync,
                               kInstallSilently, kEnableOnInstall,
-                              enable_incognito_on_install);
+                              kEnableIncognitoOnInstall);
 }
 
 void ExtensionsService::AddPendingExtensionInternal(
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index 211bc8de..e98db6f 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -225,10 +225,8 @@ class ExtensionsService
 
   // Given an extension id and an update URL, schedule the extension
   // to be fetched, installed, and activated.
-  void AddPendingExtensionFromExternalUpdateUrl(
-      const std::string& id,
-      const GURL& update_url,
-      bool enable_incognito_on_install);
+  void AddPendingExtensionFromExternalUpdateUrl(const std::string& id,
+                                                const GURL& update_url);
 
   // Reloads the specified extension.
   void ReloadExtension(const std::string& extension_id);
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 281e9cb..a434b8f 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -154,10 +154,6 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
   MockProviderVisitor() : ids_found_(0) {
   }
 
-  void SetIncognitoExtensions(const std::set<std::string>& incognito_list) {
-    incognito_list_ = incognito_list;
-  }
-
   int Visit(const std::string& json_data,
             const std::set<std::string>& ignore_list) {
     // Give the test json file to the provider for parsing.
@@ -213,10 +209,8 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
     }
   }
 
-  virtual void OnExternalExtensionUpdateUrlFound(
-      const std::string& id,
-      const GURL& update_url,
-      bool enable_incognito_on_install) {
+  virtual void OnExternalExtensionUpdateUrlFound(const std::string& id,
+                                                 const GURL& update_url) {
     ++ids_found_;
     DictionaryValue* pref;
     // This tests is to make sure that the provider only notifies us of the
@@ -228,8 +222,6 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
     if (pref) {
       // Remove it so we won't count it again.
       prefs_->Remove(id, NULL);
-
-      EXPECT_EQ(incognito_list_.count(id) == 1, enable_incognito_on_install);
     }
   }
 
@@ -238,7 +230,6 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
 
   scoped_ptr<ExternalPrefExtensionProvider> provider_;
   scoped_ptr<DictionaryValue> prefs_;
-  std::set<std::string> incognito_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MockProviderVisitor);
 };
@@ -1604,7 +1595,7 @@ TEST_F(ExtensionsServiceTest, UpdatePendingTheme) {
 // or not.
 TEST_F(ExtensionsServiceTest, UpdatePendingExternalCrx) {
   InitializeEmptyExtensionsService();
-  service_->AddPendingExtensionFromExternalUpdateUrl(theme_crx, GURL(), false);
+  service_->AddPendingExtensionFromExternalUpdateUrl(theme_crx, GURL());
 
   EXPECT_TRUE(ContainsKey(service_->pending_extensions(), theme_crx));
 
@@ -2333,17 +2324,11 @@ TEST_F(ExtensionsServiceTest, ExternalPrefProvider) {
       "    \"external_version\": \"2.0\""
       "  },"
       "  \"cccccccccccccccccccccccccccccccc\": {"
-      "    \"external_update_url\": \"http:\\\\foo.com/update\","
-      "    \"incognito\": true"
+      "    \"external_update_url\": \"http:\\\\foo.com/update\""
       "  }"
       "}";
 
   MockProviderVisitor visitor;
-
-  std::set<std::string> incognito_list;
-  incognito_list.insert("cccccccccccccccccccccccccccccccc");
-  visitor.SetIncognitoExtensions(incognito_list);
-
   std::set<std::string> ignore_list;
   EXPECT_EQ(3, visitor.Visit(json_data, ignore_list));
   ignore_list.insert("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
diff --git a/chrome/browser/extensions/external_extension_provider.h b/chrome/browser/extensions/external_extension_provider.h
index 83086e0..eddea62 100644
--- a/chrome/browser/extensions/external_extension_provider.h
+++ b/chrome/browser/extensions/external_extension_provider.h
@@ -32,8 +32,7 @@ class ExternalExtensionProvider {
 
      virtual void OnExternalExtensionUpdateUrlFound(
          const std::string& id,
-         const GURL& update_url,
-         bool enable_incognito_on_install) = 0;
+         const GURL& update_url) = 0;
 
    protected:
      virtual ~Visitor() {}
diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc
index d854a7f..3eaafc9 100644
--- a/chrome/browser/extensions/external_pref_extension_provider.cc
+++ b/chrome/browser/extensions/external_pref_extension_provider.cc
@@ -18,7 +18,6 @@ const char kLocation[] = "location";
 const char kState[] = "state";
 const char kExternalCrx[] = "external_crx";
 const char kExternalVersion[] = "external_version";
-const char kIncognito[] = "incognito";
 const char kExternalUpdateUrl[] = "external_update_url";
 
 ExternalPrefExtensionProvider::ExternalPrefExtensionProvider() {
@@ -58,15 +57,12 @@ void ExternalPrefExtensionProvider::VisitRegisteredExtension(
     FilePath::StringType external_crx;
     std::string external_version;
     std::string external_update_url;
-    bool enable_incognito_on_install = false;
 
     bool has_external_crx = extension->GetString(kExternalCrx, &external_crx);
     bool has_external_version = extension->GetString(kExternalVersion,
                                                      &external_version);
     bool has_external_update_url = extension->GetString(kExternalUpdateUrl,
                                                         &external_update_url);
-    extension->GetBoolean(kIncognito, &enable_incognito_on_install);
-
     if (has_external_crx != has_external_version) {
       LOG(WARNING) << "Malformed extension dictionary for extension: "
                    << extension_id.c_str() << ".  " << kExternalCrx
@@ -121,8 +117,7 @@ void ExternalPrefExtensionProvider::VisitRegisteredExtension(
                    << "\".";
       continue;
     }
-    visitor->OnExternalExtensionUpdateUrlFound(extension_id, update_url,
-                                               enable_incognito_on_install);
+    visitor->OnExternalExtensionUpdateUrlFound(extension_id, update_url);
   }
 }