Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / opaque_browser_frame_view_layout_unittest.cc

diff --git a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
index f18cc40..518380f 100644 (file)
--- a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
+++ b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/avatar_label.h"
-#include "chrome/browser/ui/views/avatar_menu_button.h"
+#include "chrome/browser/ui/views/profiles/avatar_label.h"
+#include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/common/chrome_switches.h"
@@ -128,10 +128,6 @@ class TestLayoutDelegate : public OpaqueBrowserFrameViewLayoutDelegate {
     return IsTabStripVisible() ? Tab::GetMinimumUnselectedSize().height() : 0;
   }
 
-  virtual int GetAdditionalReservedSpaceInTabStrip() const OVERRIDE {
-    return 0;
-  }
-
   virtual gfx::Size GetTabstripPreferredSize() const OVERRIDE {
     // Measured from Tabstrip::GetPreferredSize().
     return IsTabStripVisible() ? gfx::Size(78, 29) : gfx::Size(0, 0);