Don't disable packaged / hosted Apps on profile_reset

chrome/browser/profile_resetter/profile_resetter_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/profile_resetter/profile_resetter.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 210 matching lines @@
   fetcher->set_response_headers(download_headers);
   return fetcher.Pass();
 }
 
 
 // helper functions -----------------------------------------------------------
 
 scoped_refptr<Extension> CreateExtension(const std::string& name,
                                          const base::FilePath& path,
                                          Manifest::Location location,
-                                         bool theme) {
+                                         extensions::Manifest::Type type) {
   DictionaryValue manifest;
   manifest.SetString(extension_manifest_keys::kVersion, "1.0.0.0");
   manifest.SetString(extension_manifest_keys::kName, name);
-  manifest.SetString("app.launch.web_url", "http://www.google.com");
-  if (theme)
-    manifest.Set(extension_manifest_keys::kTheme, new DictionaryValue);
+  switch (type) {
+    case extensions::Manifest::TYPE_THEME:
+      manifest.Set(extension_manifest_keys::kTheme, new DictionaryValue);
+      break;
+    case extensions::Manifest::TYPE_HOSTED_APP:
+      manifest.SetString("app.launch.web_url", "http://www.google.com");
+      break;
+    case extensions::Manifest::TYPE_EXTENSION:
+      // do nothing
+      break;
+    default:
+      NOTREACHED();
+  }
   manifest.SetString(extension_manifest_keys::kOmniboxKeyword, name);
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
       path,
       location,
       manifest,
       Extension::NO_FLAGS,
       &error);
   EXPECT_TRUE(extension.get() != NULL) << error;
   return extension;
@@ skipping 15 matching lines @@
   // Search engine's logic is tested by
   // TemplateURLServiceTest.ResetURLs.
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
   prefs->SetString(prefs::kLastPromptedGoogleURL, "http://www.foo.com/");
 
   scoped_refptr<Extension> extension = CreateExtension(
       "xxx",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::COMPONENT,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(extension.get());
 
   ResetAndWait(ProfileResetter::DEFAULT_SEARCH_ENGINE);
 
   // TemplateURLService should reset extension search engines.
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile());
   TemplateURL* ext_url = model->GetTemplateURLForKeyword(ASCIIToUTF16("xxx"));
   ASSERT_TRUE(ext_url);
   EXPECT_TRUE(ext_url->IsExtensionKeyword());
@@ skipping 141 matching lines @@
           content_type, std::string(), &host_settings);
       EXPECT_EQ(1U, host_settings.size());
     }
   }
 }
 
 TEST_F(ProfileResetterTest, ResetExtensionsByDisabling) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
-  scoped_refptr<Extension> theme = CreateExtension("example1", temp_dir.path(),
-                                                   Manifest::INVALID_LOCATION,
-                                                   true);
+  scoped_refptr<Extension> theme =
+      CreateExtension("example1",
+                      temp_dir.path(),
+                      Manifest::INVALID_LOCATION,
+                      extensions::Manifest::TYPE_THEME);
   service_->FinishInstallationForTest(theme.get());
   // Let ThemeService finish creating the theme pack.
   base::MessageLoop::current()->RunUntilIdle();
 
   // ThemeService isn't compiled for Android.
   ThemeService* theme_service =
       ThemeServiceFactory::GetForProfile(profile());
   EXPECT_FALSE(theme_service->UsingDefaultTheme());
 
   scoped_refptr<Extension> ext2 = CreateExtension(
       "example2",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(ext2.get());
   // Components and external policy extensions shouldn't be deleted.
   scoped_refptr<Extension> ext3 = CreateExtension(
       "example3",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent2")),
       Manifest::COMPONENT,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(ext3.get());
   scoped_refptr<Extension> ext4 =
       CreateExtension("example4",
                       base::FilePath(FILE_PATH_LITERAL("//nonexistent3")),
                       Manifest::EXTERNAL_POLICY_DOWNLOAD,
-                      false);
+                      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(ext4.get());
   EXPECT_EQ(4u, service_->extensions()->size());
 
   ResetAndWait(ProfileResetter::EXTENSIONS);
-
   EXPECT_EQ(2u, service_->extensions()->size());
+  EXPECT_FALSE(service_->extensions()->Contains(theme->id()));
+  EXPECT_FALSE(service_->extensions()->Contains(ext2->id()));
   EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
   EXPECT_TRUE(service_->extensions()->Contains(ext4->id()));
   EXPECT_TRUE(theme_service->UsingDefaultTheme());
 }
 
 TEST_F(ProfileResetterTest, ResetExtensionsByDisablingNonOrganic) {
   scoped_refptr<Extension> ext2 = CreateExtension(
       "example2",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(ext2.get());
   // Components and external policy extensions shouldn't be deleted.
   scoped_refptr<Extension> ext3 = CreateExtension(
       "example3",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent2")),
       Manifest::INVALID_LOCATION,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);
   service_->AddExtension(ext3.get());
   EXPECT_EQ(2u, service_->extensions()->size());
 
   std::string master_prefs(kDistributionConfig);
   ReplaceString(&master_prefs, "placeholder_for_id", ext3->id());
 
   ResetAndWait(ProfileResetter::EXTENSIONS, master_prefs);
 
   EXPECT_EQ(1u, service_->extensions()->size());
   EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
 }
 
+TEST_F(ProfileResetterTest, ResetExtensionsCheckTypeFilter) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  scoped_refptr<Extension> ext1 =
+      CreateExtension("example1",
+                      temp_dir.path(),
+                      Manifest::INVALID_LOCATION,
+                      extensions::Manifest::TYPE_THEME);
+  service_->FinishInstallationForTest(ext1.get());
+  // Let ThemeService finish creating the theme pack.
+  base::MessageLoop::current()->RunUntilIdle();
+
+  // ThemeService isn't compiled for Android.
+  ThemeService* theme_service =
+      ThemeServiceFactory::GetForProfile(profile());
+  EXPECT_FALSE(theme_service->UsingDefaultTheme());
+
+  scoped_refptr<Extension> ext2 =
+      CreateExtension("example2",
+                      base::FilePath(FILE_PATH_LITERAL("//nonexistent2")),
+                      Manifest::INVALID_LOCATION,
+                      extensions::Manifest::TYPE_EXTENSION);
+  service_->AddExtension(ext2.get());
+
+  scoped_refptr<Extension> ext3 =
+      CreateExtension("example2",
+                      base::FilePath(FILE_PATH_LITERAL("//nonexistent3")),
+                      Manifest::INVALID_LOCATION,
+                      extensions::Manifest::TYPE_HOSTED_APP);
+  service_->AddExtension(ext3.get());
+  EXPECT_EQ(3u, service_->extensions()->size());
+
+  ResetAndWait(ProfileResetter::EXTENSIONS);

[vasilii, 2013/08/02 10:52:06]

Blank line after.

[battre, 2013/08/02 11:54:12]

Done.

+  EXPECT_EQ(1u, service_->extensions()->size());
+  EXPECT_FALSE(service_->extensions()->Contains(ext1->id()));
+  EXPECT_FALSE(service_->extensions()->Contains(ext2->id()));
+  EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
+  EXPECT_TRUE(theme_service->UsingDefaultTheme());
+}
+
 TEST_F(ProfileResetterTest, ResetStartPage) {
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
 
   SessionStartupPref startup_pref(SessionStartupPref::URLS);
   startup_pref.urls.push_back(GURL("http://foo"));
   startup_pref.urls.push_back(GURL("http://bar"));
   SessionStartupPref::SetStartupPref(prefs, startup_pref);
 
   ResetAndWait(ProfileResetter::STARTUP_PAGES);
@@ skipping 16 matching lines @@
   EXPECT_EQ(SessionStartupPref::URLS, startup_pref.type);
   const GURL urls[] = {GURL("http://goo.gl"), GURL("http://foo.de")};
   EXPECT_EQ(std::vector<GURL>(urls, urls + arraysize(urls)), startup_pref.urls);
 }
 
 TEST_F(PinnedTabsResetTest, ResetPinnedTabs) {
   scoped_refptr<Extension> extension_app = CreateExtension(
       "hello!",
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
-      false);
+      extensions::Manifest::TYPE_EXTENSION);

[vasilii, 2013/08/02 10:52:06]

No. Here it's important to install app.

[battre, 2013/08/02 11:54:12]

Done.

   scoped_ptr<content::WebContents> contents1(CreateWebContents());
   extensions::TabHelper::CreateForWebContents(contents1.get());
   extensions::TabHelper::FromWebContents(contents1.get())->
       SetExtensionApp(extension_app.get());
   scoped_ptr<content::WebContents> contents2(CreateWebContents());
   scoped_ptr<content::WebContents> contents3(CreateWebContents());
   scoped_ptr<content::WebContents> contents4(CreateWebContents());
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
 
   tab_strip_model->AppendWebContents(contents4.get(), true);
@@ skipping 153 matching lines @@
     EXPECT_EQ(!!(field_mask & ResettableSettingsSnapshot::HOMEPAGE),
               dict->GetString("homepage", &homepage));
     EXPECT_EQ(!!(field_mask & ResettableSettingsSnapshot::HOMEPAGE_IS_NTP),
               dict->GetBoolean("homepage_is_ntp", &homepage_is_ntp));
     EXPECT_EQ(!!(field_mask & ResettableSettingsSnapshot::DSE_URL),
               dict->GetString("default_search_engine", &default_search_engine));
   }
 }
 
 }  // namespace