Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / setup / install_unittest.cc

diff --git a/src/chrome/installer/setup/install_unittest.cc b/src/chrome/installer/setup/install_unittest.cc
index e617a19..5c3f32c 100644 (file)
--- a/src/chrome/installer/setup/install_unittest.cc
+++ b/src/chrome/installer/setup/install_unittest.cc
@@ -6,11 +6,11 @@
 
 #include <string>
 
+#include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
@@ -33,7 +33,7 @@ namespace {
 
 class CreateVisualElementsManifestTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 
@@ -46,7 +46,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
         test_dir_.path().Append(installer::kVisualElementsManifest);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
@@ -66,7 +66,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
 
 class InstallShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_EQ(S_OK, CoInitialize(NULL));
 
     dist_ = BrowserDistribution::GetDistribution();
@@ -139,7 +139,7 @@ class InstallShortcutTest : public testing::Test {
         fake_user_desktop_.path().Append(alternate_shortcut_name);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Try to unpin potentially pinned shortcuts (although pinning isn't tested,
     // the call itself might still have pinned the Start Menu shortcuts).
     base::win::TaskbarUnpinShortcutLink(