Removing media::StateMatrix.

It was experimental code for doing control-flow-esque state machines but has sat unused for a long time.

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10795035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147543 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 144 deletions

diff --git a/media/base/state_matrix.cc b/media/base/state_matrix.cc
deleted file mode 100644
index 0d71a9c..0000000
--- a/media/base/state_matrix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2010 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.
-
-#include "media/base/state_matrix.h"
-
-#include "base/stl_util.h"
-
-namespace media {
-
-StateMatrix::StateMatrix() {
-}
-
-StateMatrix::~StateMatrix() {
-  STLDeleteValues(&states_);
-}
-
-bool StateMatrix::IsStateDefined(int state) {
-  return states_.find(state) != states_.end();
-}
-
-int StateMatrix::ExecuteHandler(void* instance, int state) {
-  return states_.find(state)->second->ExecuteHandler(instance);
-}
-
-}  // namespace media
diff --git a/media/base/state_matrix.h b/media/base/state_matrix.h
deleted file mode 100644
index 07ce514..0000000
--- a/media/base/state_matrix.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2011 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 MEDIA_BASE_STATE_MATRIX_H_
-#define MEDIA_BASE_STATE_MATRIX_H_
-
-#include <map>
-
-#include "base/logging.h"
-#include "media/base/media_export.h"
-
-namespace media {
-
-class MEDIA_EXPORT StateMatrix {
- public:
-  StateMatrix();
-  ~StateMatrix();
-
-  template <typename HandlerType>
-  void AddState(int state, int (HandlerType::* handler)()) {
-    CHECK(!IsStateDefined(state));
-    StateEntryBase* entry = new StateEntry<HandlerType>(handler);
-    states_.insert(std::make_pair(state, entry));
-  }
-
-  bool IsStateDefined(int state);
-
-  int ExecuteHandler(void* instance, int state);
-
- private:
-  class StateEntryBase {
-   public:
-    StateEntryBase() {}
-    virtual ~StateEntryBase() {}
-
-    virtual int ExecuteHandler(void* instance) = 0;
-  };
-
-  template <typename HandlerType>
-  class StateEntry : public StateEntryBase {
-   public:
-    explicit StateEntry(int (HandlerType::* handler)()) : handler_(handler) {}
-    virtual ~StateEntry() {}
-
-    virtual int ExecuteHandler(void* instance) {
-      return (reinterpret_cast<HandlerType*>(instance)->*handler_)();
-    }
-
-   private:
-    int (HandlerType::* handler_)();
-  };
-
-  typedef std::map<int, StateEntryBase*> StateMap;
-  StateMap states_;
-
-  DISALLOW_COPY_AND_ASSIGN(StateMatrix);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_BASE_STATE_MATRIX_H_
diff --git a/media/base/state_matrix_unittest.cc b/media/base/state_matrix_unittest.cc
deleted file mode 100644
index 599ea6f..0000000
--- a/media/base/state_matrix_unittest.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2010 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.
-
-#include "media/base/state_matrix.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-using ::testing::Return;
-
-namespace media {
-
-class MockStateHandler {
- public:
-  enum State {
-    A,
-    B,
-    C,
-  };
-
-  MOCK_METHOD0(HandleA, int());
-  MOCK_METHOD0(HandleB, int());
-  MOCK_METHOD0(HandleC, int());
-};
-
-TEST(StateMatrixTest, AddState) {
-  MockStateHandler handler;
-  StateMatrix sm;
-
-  EXPECT_FALSE(sm.IsStateDefined(MockStateHandler::A));
-  EXPECT_FALSE(sm.IsStateDefined(MockStateHandler::B));
-  EXPECT_FALSE(sm.IsStateDefined(MockStateHandler::C));
-
-  sm.AddState(MockStateHandler::A, &MockStateHandler::HandleA);
-
-  EXPECT_TRUE(sm.IsStateDefined(MockStateHandler::A));
-  EXPECT_FALSE(sm.IsStateDefined(MockStateHandler::B));
-  EXPECT_FALSE(sm.IsStateDefined(MockStateHandler::C));
-}
-
-TEST(StateMatrixTest, ExecuteHandler) {
-  MockStateHandler handler;
-  StateMatrix sm;
-
-  sm.AddState(MockStateHandler::A, &MockStateHandler::HandleA);
-
-  EXPECT_CALL(handler, HandleA())
-      .WillOnce(Return(MockStateHandler::B));
-
-  EXPECT_EQ(MockStateHandler::B,
-            sm.ExecuteHandler(&handler, MockStateHandler::A));
-}
-
-}  // namespace media
diff --git a/media/media.gyp b/media/media.gyp
index dfec9b7..155c9d3 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -193,8 +193,6 @@
         'base/seekable_buffer.h',
         'base/sinc_resampler.cc',
         'base/sinc_resampler.h',
-        'base/state_matrix.cc',
-        'base/state_matrix.h',
         'base/stream_parser.cc',
         'base/stream_parser.h',
         'base/stream_parser_buffer.cc',
@@ -689,7 +687,6 @@
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
         'base/sinc_resampler_unittest.cc',
-        'base/state_matrix_unittest.cc',
         'base/test_data_util.cc',
         'base/test_data_util.h',
         'base/video_frame_unittest.cc',