Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / external_policy_loader_unittest.cc

diff --git a/src/chrome/browser/extensions/external_policy_loader_unittest.cc b/src/chrome/browser/extensions/external_policy_loader_unittest.cc
index 378148d..571c3cb 100644 (file)
--- a/src/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ b/src/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/external_policy_loader.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ -31,7 +30,7 @@ class ExternalPolicyLoaderTest : public testing::Test {
   ExternalPolicyLoaderTest() : ui_thread_(BrowserThread::UI, &loop_) {
   }
 
-  virtual ~ExternalPolicyLoaderTest() {}
+  ~ExternalPolicyLoaderTest() override {}
 
  private:
   // We need these to satisfy BrowserThread::CurrentlyOn(BrowserThread::UI)
@@ -56,7 +55,8 @@ class MockExternalPolicyProviderVisitor
     provider_.reset(new ExternalProviderImpl(
         this,
         new ExternalPolicyLoader(
-            ExtensionManagementFactory::GetForBrowserContext(profile_.get())),
+            ExtensionManagementFactory::GetForBrowserContext(profile_.get()),
+            ExternalPolicyLoader::FORCED),
         profile_.get(),
         Manifest::INVALID_LOCATION,
         Manifest::EXTERNAL_POLICY_DOWNLOAD,
@@ -69,23 +69,22 @@ class MockExternalPolicyProviderVisitor
     EXPECT_TRUE(expected_extensions_.empty());
   }
 
-  virtual bool OnExternalExtensionFileFound(const std::string& id,
-                                            const Version* version,
-                                            const base::FilePath& path,
-                                            Manifest::Location unused,
-                                            int unused2,
-                                            bool unused3) OVERRIDE {
+  bool OnExternalExtensionFileFound(const std::string& id,
+                                    const Version* version,
+                                    const base::FilePath& path,
+                                    Manifest::Location unused,
+                                    int unused2,
+                                    bool unused3) override {
     ADD_FAILURE() << "There should be no external extensions from files.";
     return false;
   }
 
-  virtual bool OnExternalExtensionUpdateUrlFound(
-      const std::string& id,
-      const std::string& install_parameter,
-      const GURL& update_url,
-      Manifest::Location location,
-      int unused1,
-      bool unused2) OVERRIDE {
+  bool OnExternalExtensionUpdateUrlFound(const std::string& id,
+                                         const std::string& install_parameter,
+                                         const GURL& update_url,
+                                         Manifest::Location location,
+                                         int unused1,
+                                         bool unused2) override {
     // Extension has the correct location.
     EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, location);
 
@@ -101,8 +100,8 @@ class MockExternalPolicyProviderVisitor
     return true;
   }
 
-  virtual void OnExternalProviderReady(
-      const ExternalProviderInterface* provider) OVERRIDE {
+  void OnExternalProviderReady(
+      const ExternalProviderInterface* provider) override {
     EXPECT_EQ(provider, provider_.get());
     EXPECT_TRUE(provider->IsReady());
   }