Moved CrxInstaller and CrxInstallerError into extensions namespace

chrome/browser/extensions/crx_installer_browsertest.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 "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_test_observer.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class SkBitmap;
 
-using extensions::Extension;
+namespace extensions {
 
 namespace {
 
 // Observer waits for exactly one download to finish.
 
 class MockInstallPrompt : public ExtensionInstallPrompt {
  public:
   explicit MockInstallPrompt(gfx::NativeWindow parent,
                              content::PageNavigator* navigator,
                              Profile* profile) :
@@ skipping 47 matching lines @@
       MockInstallPrompt* mock_install_prompt) {
     ExtensionService* service = browser()->profile()->GetExtensionService();
     FilePath ext_path = test_data_dir_.AppendASCII(ext_relpath);
 
     std::string error;
     base::DictionaryValue* parsed_manifest =
         extension_file_util::LoadManifest(ext_path, &error);
     if (!parsed_manifest)
       return scoped_refptr<CrxInstaller>();
 
-    scoped_ptr<extensions::WebstoreInstaller::Approval> approval;
+    scoped_ptr<WebstoreInstaller::Approval> approval;
     if (!id.empty()) {
-      approval =
-          extensions::WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
-              browser()->profile(),
-              id,
-              scoped_ptr<base::DictionaryValue>(parsed_manifest));
+      approval = WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
+          browser()->profile(),
+          id,
+          scoped_ptr<base::DictionaryValue>(parsed_manifest));
     }
 
     scoped_refptr<CrxInstaller> installer(
         CrxInstaller::Create(service,
                              mock_install_prompt, /* ownership transferred */
                              approval.get()       /* keep ownership */));
     installer->set_allow_silent_install(true);
     installer->set_is_gallery_install(true);
     installer->InstallCrx(PackExtension(ext_path));
     ui_test_utils::RunMessageLoop();
@@ skipping 10 matching lines @@
         switches::kEnableExperimentalExtensionApis);
 
     ExtensionService* service = browser()->profile()->GetExtensionService();
 
     MockInstallPrompt* mock_prompt =
         CreateMockInstallPromptForBrowser(browser());
     mock_prompt->set_record_oauth2_grant(record_oauth2_grant);
     scoped_refptr<CrxInstaller> installer =
         InstallWithPrompt("browsertest/scopes", std::string(), mock_prompt);
 
-    scoped_refptr<extensions::PermissionSet> permissions =
+    scoped_refptr<PermissionSet> permissions =
         service->extension_prefs()->GetGrantedPermissions(
             mock_prompt->extension()->id());
     ASSERT_TRUE(permissions.get());
     EXPECT_EQ(record_oauth2_grant, installer->record_oauth2_grant_);
   }
 };
 
 #if defined(OS_CHROMEOS)
 #define MAYBE_Whitelisting DISABLED_Whitelisting
 #else
@@ skipping 39 matching lines @@
 }
 
 // http://crbug.com/136397
 #if defined(OS_CHROMEOS)
 #define MAYBE_PackAndInstallExtension DISABLED_PackAndInstallExtension
 #else
 #define MAYBE_PackAndInstallExtension PackAndInstallExtension
 #endif
 IN_PROC_BROWSER_TEST_F(
     ExtensionCrxInstallerTest, MAYBE_PackAndInstallExtension) {
-  if (!extensions::switch_utils::IsEasyOffStoreInstallEnabled())
+  if (!switch_utils::IsEasyOffStoreInstallEnabled())
     return;
 
   const int kNumDownloadsExpected = 1;
   const bool kExpectFileSelectDialog = false;
 
   LOG(ERROR) << "PackAndInstallExtension: Packing extension";
   FilePath crx_path = PackExtension(
       test_data_dir_.AppendASCII("common/background_page"));
   ASSERT_FALSE(crx_path.empty());
   std::string crx_path_string(crx_path.value().begin(), crx_path.value().end());
@@ skipping 64 matching lines @@
         kTestData[i];
     if (kTestData[i]) {
       EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i];
     } else {
       EXPECT_EQ(l10n_util::GetStringUTF16(
           IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE),
           mock_prompt->error()) << kTestData[i];
     }
   }
 }
+
+}  // namespace extensions