Revert 266940 "First step at synchronizing client model changes ..."

trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 52 matching lines @@
   return (connection_id << 16) | node_id;
 }
 
 // Creates an id used for transport from the specified parameters.
 uint32_t CreateViewId(uint16_t connection_id, uint16_t view_id) {
   return (connection_id << 16) | view_id;
 }
 
 // Creates a node with the specified id. Returns true on success. Blocks until
 // we get back result from server.
-bool CreateNode(IViewManager* view_manager, uint16_t id) {
+bool CreateNode(ViewManager* view_manager, uint16_t id) {
   bool result = false;
   view_manager->CreateNode(id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // TODO(sky): make a macro for these functions, they are all the same.
 
 // Deletes a node, blocking until done.
-bool DeleteNode(IViewManager* view_manager,
+bool DeleteNode(ViewManager* view_manager,
                 uint32_t node_id,
                 ChangeId change_id) {
   bool result = false;
   view_manager->DeleteNode(node_id, change_id,
                            base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Adds a node, blocking until done.
-bool AddNode(IViewManager* view_manager,
+bool AddNode(ViewManager* view_manager,
              uint32_t parent,
              uint32_t child,
              ChangeId change_id) {
   bool result = false;
   view_manager->AddNode(parent, child, change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Removes a node, blocking until done.
-bool RemoveNodeFromParent(IViewManager* view_manager,
+bool RemoveNodeFromParent(ViewManager* view_manager,
                           uint32_t node_id,
                           ChangeId change_id) {
   bool result = false;
   view_manager->RemoveNodeFromParent(node_id, change_id,
                                      base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Creates a view with the specified id. Returns true on success. Blocks until
 // we get back result from server.
-bool CreateView(IViewManager* view_manager, uint16_t id) {
+bool CreateView(ViewManager* view_manager, uint16_t id) {
   bool result = false;
   view_manager->CreateView(id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Sets a view on the specified node. Returns true on success. Blocks until we
 // get back result from server.
-bool SetView(IViewManager* view_manager,
+bool SetView(ViewManager* view_manager,
              uint32_t node_id,
              uint32_t view_id,
              ChangeId change_id) {
   bool result = false;
   view_manager->SetView(node_id, view_id, change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 }  // namespace
 
 typedef std::vector<std::string> Changes;
 
-class ViewManagerClientImpl : public IViewManagerClient {
+class ViewManagerClientImpl : public ViewManagerClient {
  public:
   ViewManagerClientImpl() : id_(0), quit_count_(0) {}
 
   uint16_t id() const { return id_; }
 
   Changes GetAndClearChanges() {
     Changes changes;
     changes.swap(changes_);
     return changes;
   }
 
   void WaitForId() {
     if (id_ == 0)
       DoRunLoop();
   }
 
   void DoRunLoopUntilChangesCount(size_t count) {
     if (changes_.size() >= count)
       return;
     quit_count_ = count - changes_.size();
     DoRunLoop();
   }
 
  private:
-  // IViewManagerClient overrides:
+  // ViewManagerClient overrides:
   virtual void OnConnectionEstablished(uint16_t connection_id) OVERRIDE {
     id_ = connection_id;
     if (current_run_loop)
       current_run_loop->Quit();
   }
   virtual void OnNodeHierarchyChanged(uint32_t node,
                                       uint32_t new_parent,
                                       uint32_t old_parent,
                                       ChangeId change_id) OVERRIDE {
     changes_.push_back(
@@ skipping 34 matching lines @@
 
 class ViewManagerConnectionTest : public testing::Test {
  public:
   ViewManagerConnectionTest() {}
 
   virtual void SetUp() OVERRIDE {
     AllocationScope allocation_scope;
 
     test_helper_.Init();
 
-    InterfacePipe<IViewManager, AnyInterface> pipe;
+    InterfacePipe<ViewManager, AnyInterface> pipe;
     test_helper_.shell()->Connect("mojo:mojo_view_manager",
                                   pipe.handle_to_peer.Pass());
     view_manager_.reset(pipe.handle_to_self.Pass(), &client_);
 
     client_.WaitForId();
   }
 
  protected:
   // Creates a second connection to the viewmanager.
   void EstablishSecondConnection() {
     AllocationScope allocation_scope;
-    InterfacePipe<IViewManager, AnyInterface> pipe;
+    InterfacePipe<ViewManager, AnyInterface> pipe;
     test_helper_.shell()->Connect("mojo:mojo_view_manager",
                                   pipe.handle_to_peer.Pass());
     view_manager2_.reset(pipe.handle_to_self.Pass(), &client2_);
 
     client2_.WaitForId();
   }
 
   void DestroySecondConnection() {
     view_manager2_.reset();
   }
 
   base::MessageLoop loop_;
   shell::ShellTestHelper test_helper_;
 
   ViewManagerClientImpl client_;
-  RemotePtr<IViewManager> view_manager_;
+  RemotePtr<ViewManager> view_manager_;
 
   ViewManagerClientImpl client2_;
-  RemotePtr<IViewManager> view_manager2_;
+  RemotePtr<ViewManager> view_manager2_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerConnectionTest);
 };
 
 // Verifies client gets a valid id.
 TEST_F(ViewManagerConnectionTest, ValidId) {
   // All these tests assume 1 for the client id. The only real assertion here is
   // the client id is not zero, but adding this as rest of code here assumes 1.
   EXPECT_EQ(1, client_.id());
 }
@@ skipping 269 matching lines @@
 
     Changes changes(client_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("change_id=0 node=1,1 new_view=null old_view=2,51", changes[0]);
   }
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo