Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / test / base / testing_profile_manager.cc

diff --git a/src/chrome/test/base/testing_profile_manager.cc b/src/chrome/test/base/testing_profile_manager.cc
index 2d49f6d..2ddcb99 100644 (file)
--- a/src/chrome/test/base/testing_profile_manager.cc
+++ b/src/chrome/test/base/testing_profile_manager.cc
@@ -6,7 +6,6 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -18,7 +17,7 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #endif
 
-const std::string kGuestProfileName = "Guest";
+const char kGuestProfileName[] = "Guest";
 
 namespace testing {
 
@@ -28,8 +27,7 @@ class ProfileManager : public ::ProfileManagerWithoutInit {
       : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
-  virtual Profile* CreateProfileHelper(
-      const base::FilePath& file_path) OVERRIDE {
+  Profile* CreateProfileHelper(const base::FilePath& file_path) override {
     return new TestingProfile(file_path);
   }
 };