Revert of Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/display.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 66 matching lines @@
 
  protected:
   enum UserSessionBlockReason {
     FIRST_BLOCK_REASON,
     BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
     BLOCKED_BY_LOGIN_SCREEN,
     BLOCKED_BY_USER_ADDING_SCREEN,
     NUMBER_OF_BLOCK_REASONS
   };
 
-  // Returns the rotation currentl active for the display |id|.
-  static gfx::Display::Rotation GetActiveDisplayRotation(int64 id);
-
-  // Returns the rotation currently active for the internal display.
-  static gfx::Display::Rotation GetCurrentInternalDisplayRotation();
-
   // Proxy to AshTestHelper::SupportsMultipleDisplays().
   static bool SupportsMultipleDisplays();
 
   // Proxy to AshTestHelper::SupportsHostWindowResize().
   static bool SupportsHostWindowResize();
 
   void set_start_session(bool start_session) { start_session_ = start_session; }
 
   AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
 
@@ skipping 43 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_