Fixing EffectTest.LogOpenGLCalls and cleaning up a line in DrawPassTest.

core/cross/draw_pass_test.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 46 matching lines @@
   TransformationContext* transformation_context_;
   Pack *pack_;
 };
 
 void DrawPassTest::SetUp() {
   transformation_context_ = new TransformationContext(g_service_locator);
   pack_ = object_manager_->CreatePack();
 }
 
 void DrawPassTest::TearDown() {
-  pack_->Destroy();
+  object_manager_->DestroyPack(pack_);
   delete transformation_context_;
 }
 
 TEST_F(DrawPassTest, Basic) {
   DrawPass* draw_pass = pack()->Create<DrawPass>();
   // Check that draw_pass got created.
   EXPECT_TRUE(draw_pass != NULL);
 
   // Check that the default parameters got created.
   EXPECT_TRUE(draw_pass->GetParam<ParamDrawList>(
       DrawPass::kDrawListParamName) != NULL);
   EXPECT_TRUE(draw_pass->GetParam<ParamInteger>(
       DrawPass::kSortMethodParamName) != NULL);
 }
 }  // namespace o3d